aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #360 from topless/patch-1Waylan Limberg2014-10-241-1/+1
|\ | | | | Changed logging level when loading extensions
| * Changed logging level when loading extensionsChris Topaloudis2014-10-241-1/+1
|/ | | So it suppresses messages for loaded extensions when its used as third party.
* Merge pull request #358 from facelessuser/masterWaylan Limberg2014-10-183-2/+5
|\ | | | | Fix tail out of order issue
| * Fix tail out of order issuefacelessuser2014-10-183-2/+5
|/ | | | | | | | | | | | This issue was discovered when dealing with nested inlines. In treeprocessors.py it was incorrectly handling tails. In short, tail elements were being inserted earlier than they were supposed to be. In order to fix this, the insertion index should be incremented by 1 so that when the tails are inserted into the parent, they will be just after the child they came from. Also added a test in nested-patterns to catch this issue.
* Merge pull request #350 from facelessuser/masterWaylan Limberg2014-10-061-10/+10
|\ | | | | Use Pygments API
| * Use Pygments APIfacelessuser2014-10-041-10/+10
|/
* Upped version to 2.5.12.5.1-finalWaylan Limberg2014-09-263-7/+6
| | | | Also removed an inacurate statement in the 2.5 release notes.
* Run Meta after whitespace normalizationWaylan Limberg2014-09-261-1/+1
| | | | Fixes #343. Thanks for the report @AlexJF.
* Better nested STRONG EM support.Waylan Limberg2014-09-263-2/+47
| | | | | | | | | Fixes #253. Thanks to @facelessuser for the tests. Although I removed a bunch of weird ones (even some that passed) from his PR (#342). For the most part, there is no definitive way for those to be parsed. So there is no point of testing for them. In most of those situations, authors should be mixing underscores and astericks so it is clear what is intended.
* Fix the lost tail issue in inlineprocessors.facelessuser2014-09-263-23/+40
| | | | | | See #253. Prior to this patch, if any inline processors returned an element with a tail, the tail would end up empty. This resolves that issue and will allow for #253 to be fixed. Thanks to @facelessuser for the work on this.
* Added a temp workwround for deprecated short ext names.Waylan Limberg2014-09-252-9/+10
| | | | | | | | | | | | As we chnaged the order in import trys for short names extensions (no dot syntax), an extra test was added to the import code for the occassion when a naming conflict exists. For example, if PyTables is installed (module name is tables) and the user tries to use the short name 'tables' instead of 'markdown.extensions.tables'. Fixes #341. Of course, this code will get ripped out when the old behavior is fully deprecated.
* Fixed TOC Option parsing.Waylan Limberg2014-09-252-3/+16
| | | | | | The new option parser assumes bool values if the default is bool or None. As the "title" option is not a bool value, it should default to an empty string rather than None. Fixes #347.
* Add 2.5 release date, and fix a typo.Dmitry Shachnev2014-09-152-2/+2
|
* Version 2.5-Final2.5-finalWaylan Limberg2014-09-121-1/+1
|
* Deprecate positional args for markdownFromFile also.Waylan Limberg2014-09-121-0/+4
|
* Code Blocks must always be AtomicStringsWaylan Limberg2014-09-083-3/+12
| | | | | | | | | | | | | | | | | | Fixes #340. The "inline" TreeProcessor runs before the "prettify" TreeProcessor, but the "smarty" TreeProcessor (wich is just another instance of `InlineProcessor`) runs after the "prettify" TreeProcessor. The problem was that the "prettify" TreeProcessor was losing the AtomicString quality of the text of code blocks (any operation on a string creates a new string. When that string is an AtomicString, the new string must explicitly be declared as an AtomicString. As the "prettify" TreeProcessor cleans up newlines on code blocks, it was changing the AtomicString to a normal string. And as `InlineProcessor` identifies what elements to skip solely by whether the text is an AtomicString, the "smarty" instance was running on code blocks. Importantly, I added a test of code blocks and spans for smarty, so this shouldn't break again.
* Mark "Safe Mode" as pending deprecation.Waylan Limberg2014-09-015-32/+94
| | | | | Both `safe_mode` and `html_replacement_test` keywords are pending deprecation, as are positional args. Closes #337.
* Some docs cleanup.Waylan Limberg2014-08-297-60/+53
|
* Updated extension API docs for recent changes.Waylan Limberg2014-08-292-46/+70
|
* Mark special treatment of extension names as PendingDeprecationWaylan Limberg2014-08-297-55/+111
| | | | | | | | | | | | | | | | | The builtin extensions will no longer get special treatment and have the path ("markdown.extensions.") appended . The same applies for "mdx_" extensions. All names extension must provide the full path. Fixes #336. Also deprecating support for passing in extension config settings as part of the string name. The extension_configs keyword should be used instead. Fixes #335. Also raising PendingDeprecationWarnings for positional args or the "config" keyword on the Extension Class. Pass each setting as a seperate keyword instead. Docs and tests are updated. Still need to update extension API docs.
* Code exampeles in extension docs now show best practices.Waylan Limberg2014-08-292-13/+14
| | | | | This is in anticipation of #335. The reference and extension api docs still need to be updated, but that will happen with change in the code.
* Refactored tests to no longer pass configs to names extensions.Waylan Limberg2014-08-291-10/+19
| | | | | `'path.to.module(option=value'` => `path.to.module.Class(option='value')` This is in anticipation of #335
* More updates to test configs.Waylan Limberg2014-08-297-15/+42
| | | | | | | | | | | | | | The last few extensions were updated to accept dicts/**kwargs as configs and more tests were updated. Also updated extra to actually accept configs. Note that extra requires an extra level of dicts. First you need to indicate tha the settings are for extra, then, which extension extra wraps. I'm not crazy abount this, bit not sur ehow else to do it without making all the configs a global attribute on the Markdown class to that any extention can access any other extensions config settings. I don't think we wnat to do that. Also updated extra to use dot notation for the sub-extensions.
* Docs now use dot notation for all extensions.Waylan Limberg2014-08-2918-59/+52
| | | | | | Except were "short names" are explained in the docs, all references to the buitlin extensions now use `markdown.extensions.*` in anticipation of #336.
* All extension tests now use python dot notation.Waylan Limberg2014-08-294-65/+67
| | | | | | | | | | All named extensions now use python dot notation in the tests - including all builtin extensions (eg: 'extra' => 'markdown.extensions.extra'). This is in anticipation of #336. Note there are a few tests (in the error tests) that will still need updating, but not till we make the change as they will test for the new error message.
* Merge branch 'master' of https://github.com/waylan/Python-MarkdownWaylan Limberg2014-08-271-1/+1
|\
| * Fixed a small bug in --extension_configs CLI option.Waylan Limberg2014-08-251-1/+1
| | | | | | | | | | | | | | | | | | This needs to work with the JSON lib if PyYaml isn't available. Therefore, we can't catch a yaml specific exception. The tests are fine using a yaml specific exception as the yaml lib is required by the testing framework anyway. So yaml is always available when running the tests.
* | Various tweaks to release notes.Waylan Limberg2014-08-271-34/+46
| |
* | Allow named extensions to specify the Class NameWaylan Limberg2014-08-273-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you were to import the class like this: from path.to.module import SomeExtensionClass Then the named extension would be the string: "path.to.module:SomeExtensionClass" This should simplify loading extensions from the command line or template filters -- expecially when multiple extensions are defined in a single python module. The docs still need updating. I'm waiting to update the docs after implementing #335 and #336 as that will require a major refactor of that section of the docs anyway.
* | Refactored extension importing.Waylan Limberg2014-08-276-27/+45
|/ | | | | | | | | | | | | We now use importlib which means we no longer support Python 2.6. Also, this refactor properly imports third party extensions which reside at the root of PYTHONPATH. Previously, either `markdown.extensions.` or `mdx_` would be appended to any extension name that did not contain a dot, which required third party extensions to either be in submodules or use the old `mdx_` naming convention. This commit is also in preperation for #336. It will now be much easier to deprecate (and later remove) support for the old ways of handling extension names.
* Removed some old codeWaylan Limberg2014-08-251-4/+1
| | | | | | These couple lines were from an old - no longer used - method of stashing inlines. There is no need for it today. The if statement would never evaluate True.
* Added some inline pattenr tests.Waylan Limberg2014-08-259-3/+22
| | | | | | | | | markdown/inlinepatterns.py is now at 99% coverage. I have no idea why the two remaining lines are not not covered. I it not clear to me under what circumstances this two if statements would ever evaluate to True. I'm inclined to just remove them, but perhaps there is an edge case I'm missing. I'll take another look later.
* Fixed a bug in markdown.util.parseBoolValueWaylan Limberg2014-08-252-3/+8
| | | | | A couple scenarios with "None" were previously not accounted for. Also updated tests which guives us 100% for markdown/util.py
* Add test of unsafe HTML in stash with safe_mode='excape'Waylan Limberg2014-08-251-0/+20
| | | | This should give us 100% coverage of postprocessors.py.
* Include __main__.py in coverage.Waylan Limberg2014-08-222-4/+3
|
* Note deprecation of `force_linenums` keyword in release notes.Waylan Limberg2014-08-221-3/+9
|
* Added `--extension_configs` option to the CLI.Waylan Limberg2014-08-224-29/+251
| | | | | | | | | | The `--extension_configs` option must point to a YAML or JSON file. The contents of the file must parse to a Python Dict which will be passed to the `extension_configs` keyword of the `markdown.Markdown` class. Also added tests for all of the CLI option parsing options and updated documentation.
* Cleaned up some whitespace inconsistancies.Waylan Limberg2014-08-221-1/+1
|
* Update docs for tests refactor. INI => YAML. Relates to #333.Waylan Limberg2014-08-212-16/+17
|
* Standardized all extension header comments to a uniform format.Waylan Limberg2014-08-2117-446/+193
|
* 'http://packages.python.org/Markdown/' => ↵Waylan Limberg2014-08-2115-32/+32
| | | | 'https://pythonhosted.org/Markdown/'. The former redirects to the latter anyway. Might as well point to the actual destination.
* Updated generate code for tests refactor. Related to #333.Waylan Limberg2014-08-212-4/+4
|
* Upped version to 2.5-dev and started release notes.Waylan Limberg2014-08-205-4/+51
|
* Fix a typo in testing refactor. Related to #333Waylan Limberg2014-08-201-1/+1
|
* Update lib reference docs to reflect that extension_configs accepts dicts. ↵Waylan Limberg2014-08-201-10/+14
| | | | Related to #325
* Refactored test framework to use YAML config files rather than INI. Fixes #333.Waylan Limberg2014-08-2018-212/+245
|
* Renamed 'smart_substitutions' option to 'substitutions'. Fixed a typo.Martin Altmayer2014-08-153-8/+7
|
* Added test for the new 'smart_substitutions' feature of Smarty extension.Martin Altmayer2014-08-141-0/+33
|
* Fixed an old typo in the smarty extension and added a test case.Martin Altmayer2014-08-113-3/+5
|
* Replaced smart_lsquo etc. by a single option smart_substitutions which ↵Martin Altmayer2014-08-112-23/+49
| | | | allows to overwrite all substitution strings. Fixed line length in docs.