aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated fix for #158 for Python <2.7Waylan Limberg2012-11-081-1/+1
| | | | | | | Apparently, the `errors` keyword to encode was added in Python 2.7. In previous versions, it was just a positional argument. This should now work in all support versions. Thanks to @Gamma3000 for assistance in working through this issue.
* Fixed #158. Now properly encoding output to stdout.Waylan Limberg2012-11-071-8/+7
| | | | | | | | This is another try at this problem. The trick is geting code that works with both Python 2 and Python 3. I think this does it. The only improvment I can see now is to catch any errors and customize the error message to sugg that the user set the environment variable PYTHONIOENCODING to the desired encoding before calling the commandline script.
* Merge branch 'master' of https://github.com/waylan/Python-Markdown2.2.1.finalWaylan Limberg2012-11-046-32/+90
|\
| * Fixed minor typo in attr_list docs. Waylan Limberg2012-11-041-1/+1
| | | | | | Thanks @mitya57.
| * Merge pull request #157 from mitya57/masterWaylan Limberg2012-11-033-27/+68
| |\ | | | | | | Improve docs/extensions/index.txt so that the name for each extension is properly identified.
| | * docs/basic.css: Improve CSS a bitDmitry Shachnev2012-11-031-8/+15
| | |
| | * docs/extensions/index.txt: make it clear what name to pass for extensionsDmitry Shachnev2012-11-031-19/+53
| | |
| | * Remove exec bit from extensions/fenced_code.pyDmitry Shachnev2012-11-031-0/+0
| |/
| * Fix silly typo in previous commit.Waylan Limberg2012-11-011-1/+1
| |
| * A better fix for #155. Unescaping inline placholders now returns the text ↵Waylan Limberg2012-11-011-6/+19
| | | | | | | | only of an Element - rather than the html which just gets html escaped in the output anyway.
| * Fixed #154. Inline placeholders in img alt text are now unescaped.Waylan Limberg2012-11-011-1/+1
| |
| * Fixed #155. Early unescaping of inline placeholders now works when the ↵Waylan Limberg2012-11-011-1/+5
| | | | | | | | placeholder is an Elementtree Element.
| * Merge pull request #156 from mitya57/masterWaylan Limberg2012-10-261-1/+1
| |\ | | | | | | Fix the link in docs' bottom panel
| | * Apply a fix from commit 3e6e70eb48 to the bottom panel as wellDmitry Shachnev2012-10-261-1/+1
| |/
* | Upped version to 2.2.1.Waylan Limberg2012-11-046-9/+24
| |
* | Fixed CodeHilite test when pygments is not installed.Waylan Limberg2012-11-041-1/+1
|/
* Fixed #153. Two spaces at end of paragraph is not a linebreak.Waylan Limberg2012-10-214-14/+6
|
* Fixed #152. Spaces in links are now escaped.Waylan Limberg2012-10-213-3/+4
|
* Fixed #151. Raw html matching is now case-insensitive.Waylan Limberg2012-10-213-2/+13
|
* Merge pull request #142 from mitya57/masterWaylan Limberg2012-09-091-0/+21
|\ | | | | Add `long_description` attribute to `data` in `setup.py`
| * Remove unneeded linkDmitry Shachnev2012-09-091-1/+0
| |
| * setup.py: Add `long_description` attribute to `data`Dmitry Shachnev2012-09-091-0/+22
|/ | | | so that there's no text breakage on PyPI page
* Fixed #141. Minor typo on wikilinks docs.Waylan Limberg2012-09-071-1/+1
| | | Thanks for the report.
* Merge pull request #139 from Grahack/patch-2Waylan Limberg2012-08-291-2/+2
|\ | | | | Typo: Boolen -> Boolean.
| * Typo: Boolen -> Boolean.Grahack2012-08-291-2/+2
|/
* Merge pull request #137 from mitya57/masterWaylan Limberg2012-08-281-1/+1
|\ | | | | Fixed not working "index" link in extensions documentation
| * Fixed not working "index" link in extensions documentationDmitry Shachnev2012-08-281-1/+1
| |
* | Merge pull request #136 from Grahack/typosWaylan Limberg2012-08-284-6/+6
|\ \ | |/ |/| Misc typos.
| * Misc typos.chri2012-08-284-6/+6
|/
* Merge pull request #131 from mitya57/masterWaylan Limberg2012-08-272-2399/+2398
|\ | | | | Fixed `footnote_many_footnotes` test
| * Merge commit '63020032eab733ed74f06a687abb5c358de4e931'Dmitry Shachnev2012-08-261-1/+0
| |\
| | * Don't import from doctest, it's no longer usedDmitry Shachnev2012-08-261-1/+0
| |/ |/|
| * Fix `footnote_many_footnotes` test as per #129Dmitry Shachnev2012-08-251-2398/+2398
|/
* Merge branch 'master' of https://github.com/waylan/Python-MarkdownWaylan Limberg2012-08-231-1/+1
|\
| * Merge pull request #130 from erikvanzijst/masterWaylan Limberg2012-08-151-1/+1
| |\ | | | | | | Fix unicode problem in headerid extension
| | * Fixed unicode breakage.Erik van Zijst2012-08-141-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slugify() requires unicode, not a str instance. This causes the extension to crash: File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/__init__.py" in markdown 386. return md.convert(text) File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/__init__.py" in convert 287. newRoot = treeprocessor.run(root) File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/extensions/headerid.py" in run 140. id = slugify(''.join(itertext(elem)), sep) File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/extensions/headerid.py" in slugify 93. value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore') TypeError: must be unicode, not str
* / Fixed encoding issues when writing to stdout.Waylan Limberg2012-08-231-2/+9
|/ | | | | | | | | | | | | | | | | In Python 2.x, if you write to stdout and stdout is piped (for example: `python -m markdown foo.txt | less`), then `sys.stdout.encoding` is `None` and an error is rasied. Commit 1132f9e20cd7a5d6be809651f1034c44c32dbc0e was an attempt to fix this, and it works in Python 2.x. However, it does not work in Python 3.x, which does not exhibit this problem. In fact, that fix actually breaks things in Python 3 whether the output is piped or not. Additionaly, in Python 2.x, the fix is not needed if the output is not being piped. As we do not have a version specific issue, but an issue with `sys.stdout.encoding`, we check for that to determine which way to go. This way, the "right thing" *should* happen every time.
* Merge branch 'master' of https://github.com/waylan/Python-MarkdownWaylan Limberg2012-08-091-11/+6
|\
| * Removed references to doctests in docs as per #114Waylan Limberg2012-07-261-11/+6
| |
* | Fixed #129. Footnotes now output valid HTML5.Waylan Limberg2012-08-094-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As HTML5 has depreciated use of `rev=anything` and `rel=footnotes`, they are no longer inlcuded in the output when the output_format is set to HTML5. Note that if someone successful registers a spec for `rel=footnotes` in the future (as a microformat), then that could be considered valid. But until that happens, it is invlaid to use in HTML5. Therefore, we remove it from the output (when outputing HTML% only). As an alternative, two new classes are set (in all output_formats). On the link to the footnote (where `rel=footnotes` was used), we set `class=footnote-ref` and on the backlink (where `rev=footnote` was used), we set `class=footnote-backref`. Also updated the tests to reflect to the new classes in the output.
* | Improved `Markdown.set_output_format()`Waylan Limberg2012-08-091-4/+10
|/ | | | | | | | | | Specificaly, `self.output_format` is defined and contains a string of the output format used on the instance. This is more useful that an instance of the searializer when determining alternate behavior elsewhere in the parser. For example, see Issue #129. Also cleaned up the error when an invalid format is provided. We now re-raise the original error (with a custom message) rather than raising a new error.
* Fixed #114. Converted doctests to unittests. While I left the doctests there ↵Waylan Limberg2012-07-262-1/+275
| | | | for documentation purposes, they are no longer being run. Perhaps I'll delete them later and add links to the online docs or something.
* Merge pull request #127 from svetlyak40wt/fix-piped-stdoutWaylan Limberg2012-07-261-1/+2
|\ | | | | Fixed UnicodeEncodeError when output from markdown_py is piped
| * Fixed UnicodeEncodeError when output from markdown_py is piped into another ↵Alexander Artemenko2012-07-261-1/+2
|/ | | | | | | program. In this case text should be encoded into the output encoding explicitly, because sys.stdout.encoding is None, when piping data.
* Merge pull request #124 from papaeye/lexer+lexerWaylan Limberg2012-07-243-1/+21
|\ | | | | Added support for <foo>+<bar> lexers of Pygments
| * Added support for <foo>+<bar> lexers of Pygmentspapaeye2012-07-213-1/+21
|/
* Merge pull request #122 from Scorpil/masterWaylan Limberg2012-07-191-1/+4
|\ | | | | More expressive ValueError description
| * Merge branch 'master' of github.com:Scorpil/Python-MarkdownScorpil2012-07-201-2/+1
| |\ | | | | | | | | | | | | Conflicts: markdown/odict.py
| | * Added more expressive description of an error.Scorpil2012-07-201-1/+5
| | |
| * | Added more expressive description of an error.Scorpil2012-07-201-1/+5
| |/