inside of a

# we actually replace the

in its entirety. - if c.text and c.text.strip() == self.marker: + + # The

element may contain more than a single text content + # (nl2br can introduce a
). In this situation, c.text returns + # the very first content, ignore children contents or tail content. + # len(c) == 0 is here to ensure there is only text in the

. + if c.text and c.text.strip() == self.marker and len(c) == 0: for i in range(len(p)): if p[i] == c: p[i] = elem diff -Nru python-markdown-3.3.4/markdown/inlinepatterns.py python-markdown-3.3.6/markdown/inlinepatterns.py --- python-markdown-3.3.4/markdown/inlinepatterns.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/markdown/inlinepatterns.py 2021-11-17 15:59:35.000000000 +0000 @@ -160,10 +160,10 @@ AUTOLINK_RE = r'<((?:[Ff]|[Hh][Tt])[Tt][Pp][Ss]?://[^<>]*)>' # -AUTOMAIL_RE = r'<([^<> !]*@[^@<> ]*)>' +AUTOMAIL_RE = r'<([^<> !]+@[^@<> ]+)>' # <...> -HTML_RE = r'(<([a-zA-Z/][^<>]*|!--(?:(?!).)*--)>)' +HTML_RE = r'(<(\/?[a-zA-Z][^<>@ ]*( [^<>]*)?|!--(?:(?!).)*--)>)' # "&" (decimal) or "&" (hex) or "&" (named) ENTITY_RE = r'(&(?:\#[0-9]+|\#x[0-9a-fA-F]+|[a-zA-Z0-9]+);)' diff -Nru python-markdown-3.3.4/markdown/__main__.py python-markdown-3.3.6/markdown/__main__.py --- python-markdown-3.3.4/markdown/__main__.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/markdown/__main__.py 2021-11-17 15:59:35.000000000 +0000 @@ -70,7 +70,7 @@ parser.add_option("-c", "--extension_configs", dest="configfile", default=None, help="Read extension configurations from CONFIG_FILE. " - "CONFIG_FILE must be of JSON or YAML format. YAML" + "CONFIG_FILE must be of JSON or YAML format. YAML " "format requires that a python YAML library be " "installed. The parsed JSON or YAML must result in a " "python dictionary which would be accepted by the " diff -Nru python-markdown-3.3.4/markdown/__meta__.py python-markdown-3.3.6/markdown/__meta__.py --- python-markdown-3.3.4/markdown/__meta__.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/markdown/__meta__.py 2021-11-17 15:59:35.000000000 +0000 @@ -26,7 +26,7 @@ # (1, 2, 0, 'beta', 2) => "1.2b2" # (1, 2, 0, 'rc', 4) => "1.2rc4" # (1, 2, 0, 'final', 0) => "1.2" -__version_info__ = (3, 3, 4, 'final', 0) +__version_info__ = (3, 3, 6, 'final', 0) def _get_version(version_info): diff -Nru python-markdown-3.3.4/markdown/postprocessors.py python-markdown-3.3.6/markdown/postprocessors.py --- python-markdown-3.3.4/markdown/postprocessors.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/markdown/postprocessors.py 2021-11-17 15:59:35.000000000 +0000 @@ -65,6 +65,8 @@ class RawHtmlPostprocessor(Postprocessor): """ Restore raw html to the document. """ + BLOCK_LEVEL_REGEX = re.compile(r'^\<\/?([^ >]+)') + def run(self, text): """ Iterate over html stash and restore html. """ replacements = OrderedDict() @@ -99,7 +101,7 @@ return self.run(processed_text) def isblocklevel(self, html): - m = re.match(r'^\<\/?([^ >]+)', html) + m = self.BLOCK_LEVEL_REGEX.match(html) if m: if m.group(1)[0] in ('!', '?', '@', '%'): # Comment, php etc... diff -Nru python-markdown-3.3.4/markdown/util.py python-markdown-3.3.6/markdown/util.py --- python-markdown-3.3.4/markdown/util.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/markdown/util.py 2021-11-17 15:59:35.000000000 +0000 @@ -21,17 +21,18 @@ import re import sys -from collections import namedtuple -from functools import wraps import warnings import xml.etree.ElementTree -from .pep562 import Pep562 +from collections import namedtuple +from functools import wraps from itertools import count -try: +from .pep562 import Pep562 + +if sys.version_info >= (3, 10): from importlib import metadata -except ImportError: - # . - - [installation]: https://python-markdown.github.io/install/ - [usage]: https://python-markdown.github.io/reference/ - - See the change log at . - - Support - ------- - - You may report bugs, ask for help, and discuss various other issues on the [bug tracker][]. - - [bug tracker]: https://github.com/Python-Markdown/markdown/issues - - Code of Conduct - --------------- - - Everyone interacting in the Python-Markdown project's codebases, issue trackers, - and mailing lists is expected to follow the [Code of Conduct]. - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: License :: OSI Approved :: BSD License @@ -87,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 +Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy @@ -101,3 +36,72 @@ Requires-Python: >=3.6 Description-Content-Type: text/markdown Provides-Extra: testing +License-File: LICENSE.md + +[Python-Markdown][] +=================== + +[![Build Status][build-button]][build] +[![Coverage Status][codecov-button]][codecov] +[![Latest Version][mdversion-button]][md-pypi] +[![Python Versions][pyversion-button]][md-pypi] +[![BSD License][bsdlicense-button]][bsdlicense] +[![Code of Conduct][codeofconduct-button]][Code of Conduct] + +[build-button]: https://github.com/Python-Markdown/markdown/workflows/CI/badge.svg?event=push +[build]: https://github.com/Python-Markdown/markdown/actions?query=workflow%3ACI+event%3Apush +[codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg +[codecov]: https://codecov.io/gh/Python-Markdown/markdown +[mdversion-button]: https://img.shields.io/pypi/v/Markdown.svg +[md-pypi]: https://pypi.org/project/Markdown/ +[pyversion-button]: https://img.shields.io/pypi/pyversions/Markdown.svg +[bsdlicense-button]: https://img.shields.io/badge/license-BSD-yellow.svg +[bsdlicense]: https://opensource.org/licenses/BSD-3-Clause +[codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square +[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md + +This is a Python implementation of John Gruber's [Markdown][]. +It is almost completely compliant with the reference implementation, +though there are a few known issues. See [Features][] for information +on what exactly is supported and what is not. Additional features are +supported by the [Available Extensions][]. + +[Python-Markdown]: https://Python-Markdown.github.io/ +[Markdown]: https://daringfireball.net/projects/markdown/ +[Features]: https://Python-Markdown.github.io#Features +[Available Extensions]: https://Python-Markdown.github.io/extensions + +Documentation +------------- + +```bash +pip install markdown +``` +```python +import markdown +html = markdown.markdown(your_text_string) +``` + +For more advanced [installation] and [usage] documentation, see the `docs/` directory +of the distribution or the project website at . + +[installation]: https://python-markdown.github.io/install/ +[usage]: https://python-markdown.github.io/reference/ + +See the change log at . + +Support +------- + +You may report bugs, ask for help, and discuss various other issues on the [bug tracker][]. + +[bug tracker]: https://github.com/Python-Markdown/markdown/issues + +Code of Conduct +--------------- + +Everyone interacting in the Python-Markdown project's codebases, issue trackers, +and mailing lists is expected to follow the [Code of Conduct]. + + + diff -Nru python-markdown-3.3.4/Markdown.egg-info/requires.txt python-markdown-3.3.6/Markdown.egg-info/requires.txt --- python-markdown-3.3.4/Markdown.egg-info/requires.txt 2021-02-24 19:57:45.000000000 +0000 +++ python-markdown-3.3.6/Markdown.egg-info/requires.txt 2021-11-17 15:59:40.000000000 +0000 @@ -1,6 +1,6 @@ -[:python_version < "3.8"] -importlib-metadata +[:python_version < "3.10"] +importlib-metadata>=4.4 [testing] coverage diff -Nru python-markdown-3.3.4/Markdown.egg-info/SOURCES.txt python-markdown-3.3.6/Markdown.egg-info/SOURCES.txt --- python-markdown-3.3.4/Markdown.egg-info/SOURCES.txt 2021-02-24 19:57:45.000000000 +0000 +++ python-markdown-3.3.6/Markdown.egg-info/SOURCES.txt 2021-11-17 15:59:40.000000000 +0000 @@ -374,6 +374,7 @@ tests/test_syntax/extensions/test_tables.py tests/test_syntax/extensions/test_toc.py tests/test_syntax/inline/__init__.py +tests/test_syntax/inline/test_autolinks.py tests/test_syntax/inline/test_emphasis.py tests/test_syntax/inline/test_entities.py tests/test_syntax/inline/test_images.py diff -Nru python-markdown-3.3.4/PKG-INFO python-markdown-3.3.6/PKG-INFO --- python-markdown-3.3.4/PKG-INFO 2021-02-24 19:57:45.000000000 +0000 +++ python-markdown-3.3.6/PKG-INFO 2021-11-17 15:59:40.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: Markdown -Version: 3.3.4 +Version: 3.3.6 Summary: Python implementation of Markdown. Home-page: https://Python-Markdown.github.io/ Author: Manfred Stienstra, Yuri takhteyev and Waylan limberg @@ -8,75 +8,9 @@ Maintainer: Waylan Limberg Maintainer-email: python.markdown@gmail.com License: BSD License -Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-3.3.4-py2.py3-none-any.whl Project-URL: Documentation, https://Python-Markdown.github.io/ Project-URL: GitHub Project, https://github.com/Python-Markdown/markdown Project-URL: Issue Tracker, https://github.com/Python-Markdown/markdown/issues -Description: [Python-Markdown][] - =================== - - [![Build Status][build-button]][build] - [![Coverage Status][codecov-button]][codecov] - [![Latest Version][mdversion-button]][md-pypi] - [![Python Versions][pyversion-button]][md-pypi] - [![BSD License][bsdlicense-button]][bsdlicense] - [![Code of Conduct][codeofconduct-button]][Code of Conduct] - - [build-button]: https://github.com/Python-Markdown/markdown/workflows/CI/badge.svg?event=push - [build]: https://github.com/Python-Markdown/markdown/actions?query=workflow%3ACI+event%3Apush - [codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg - [codecov]: https://codecov.io/gh/Python-Markdown/markdown - [mdversion-button]: https://img.shields.io/pypi/v/Markdown.svg - [md-pypi]: https://pypi.org/project/Markdown/ - [pyversion-button]: https://img.shields.io/pypi/pyversions/Markdown.svg - [bsdlicense-button]: https://img.shields.io/badge/license-BSD-yellow.svg - [bsdlicense]: https://opensource.org/licenses/BSD-3-Clause - [codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square - [Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md - - This is a Python implementation of John Gruber's [Markdown][]. - It is almost completely compliant with the reference implementation, - though there are a few known issues. See [Features][] for information - on what exactly is supported and what is not. Additional features are - supported by the [Available Extensions][]. - - [Python-Markdown]: https://Python-Markdown.github.io/ - [Markdown]: https://daringfireball.net/projects/markdown/ - [Features]: https://Python-Markdown.github.io#Features - [Available Extensions]: https://Python-Markdown.github.io/extensions - - Documentation - ------------- - - ```bash - pip install markdown - ``` - ```python - import markdown - html = markdown.markdown(your_text_string) - ``` - - For more advanced [installation] and [usage] documentation, see the `docs/` directory - of the distribution or the project website at . - - [installation]: https://python-markdown.github.io/install/ - [usage]: https://python-markdown.github.io/reference/ - - See the change log at . - - Support - ------- - - You may report bugs, ask for help, and discuss various other issues on the [bug tracker][]. - - [bug tracker]: https://github.com/Python-Markdown/markdown/issues - - Code of Conduct - --------------- - - Everyone interacting in the Python-Markdown project's codebases, issue trackers, - and mailing lists is expected to follow the [Code of Conduct]. - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: License :: OSI Approved :: BSD License @@ -87,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 +Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy @@ -101,3 +36,72 @@ Requires-Python: >=3.6 Description-Content-Type: text/markdown Provides-Extra: testing +License-File: LICENSE.md + +[Python-Markdown][] +=================== + +[![Build Status][build-button]][build] +[![Coverage Status][codecov-button]][codecov] +[![Latest Version][mdversion-button]][md-pypi] +[![Python Versions][pyversion-button]][md-pypi] +[![BSD License][bsdlicense-button]][bsdlicense] +[![Code of Conduct][codeofconduct-button]][Code of Conduct] + +[build-button]: https://github.com/Python-Markdown/markdown/workflows/CI/badge.svg?event=push +[build]: https://github.com/Python-Markdown/markdown/actions?query=workflow%3ACI+event%3Apush +[codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg +[codecov]: https://codecov.io/gh/Python-Markdown/markdown +[mdversion-button]: https://img.shields.io/pypi/v/Markdown.svg +[md-pypi]: https://pypi.org/project/Markdown/ +[pyversion-button]: https://img.shields.io/pypi/pyversions/Markdown.svg +[bsdlicense-button]: https://img.shields.io/badge/license-BSD-yellow.svg +[bsdlicense]: https://opensource.org/licenses/BSD-3-Clause +[codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square +[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md + +This is a Python implementation of John Gruber's [Markdown][]. +It is almost completely compliant with the reference implementation, +though there are a few known issues. See [Features][] for information +on what exactly is supported and what is not. Additional features are +supported by the [Available Extensions][]. + +[Python-Markdown]: https://Python-Markdown.github.io/ +[Markdown]: https://daringfireball.net/projects/markdown/ +[Features]: https://Python-Markdown.github.io#Features +[Available Extensions]: https://Python-Markdown.github.io/extensions + +Documentation +------------- + +```bash +pip install markdown +``` +```python +import markdown +html = markdown.markdown(your_text_string) +``` + +For more advanced [installation] and [usage] documentation, see the `docs/` directory +of the distribution or the project website at . + +[installation]: https://python-markdown.github.io/install/ +[usage]: https://python-markdown.github.io/reference/ + +See the change log at . + +Support +------- + +You may report bugs, ask for help, and discuss various other issues on the [bug tracker][]. + +[bug tracker]: https://github.com/Python-Markdown/markdown/issues + +Code of Conduct +--------------- + +Everyone interacting in the Python-Markdown project's codebases, issue trackers, +and mailing lists is expected to follow the [Code of Conduct]. + + + diff -Nru python-markdown-3.3.4/README.md python-markdown-3.3.6/README.md --- python-markdown-3.3.4/README.md 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/README.md 2021-11-17 15:59:35.000000000 +0000 @@ -62,3 +62,4 @@ Everyone interacting in the Python-Markdown project's codebases, issue trackers, and mailing lists is expected to follow the [Code of Conduct]. + diff -Nru python-markdown-3.3.4/setup.py python-markdown-3.3.6/setup.py --- python-markdown-3.3.4/setup.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/setup.py 2021-11-17 15:59:35.000000000 +0000 @@ -59,7 +59,6 @@ name='Markdown', version=__version__, url='https://Python-Markdown.github.io/', - download_url='http://pypi.python.org/packages/source/M/Markdown/Markdown-%s-py2.py3-none-any.whl' % __version__, project_urls={ 'Documentation': 'https://Python-Markdown.github.io/', 'GitHub Project': 'https://github.com/Python-Markdown/markdown', @@ -75,7 +74,7 @@ license='BSD License', packages=['markdown', 'markdown.extensions'], python_requires='>=3.6', - install_requires=["importlib-metadata;python_version<'3.8'"], + install_requires=["importlib-metadata>=4.4;python_version<'3.10'"], extras_require={ 'testing': [ 'coverage', @@ -118,6 +117,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', diff -Nru python-markdown-3.3.4/tests/test_syntax/extensions/test_fenced_code.py python-markdown-3.3.6/tests/test_syntax/extensions/test_fenced_code.py --- python-markdown-3.3.4/tests/test_syntax/extensions/test_fenced_code.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/tests/test_syntax/extensions/test_fenced_code.py 2021-11-17 15:59:35.000000000 +0000 @@ -381,6 +381,36 @@ if has_pygments and pygments.__version__ != required_pygments_version: self.skipTest(f'Pygments=={required_pygments_version} is required') + def test_shebang(self): + + if has_pygments: + expected = ''' +

#!test
+

+ ''' + else: + expected = ''' +

#!test
+

+ ''' + + self.assertMarkdownRenders( + self.dedent( + ''' + ``` + #!test + ``` + ''' + ), + self.dedent( + expected + ), + extensions=[ + markdown.extensions.codehilite.CodeHiliteExtension(linenums=None, guess_lang=False), + 'fenced_code' + ] + ) + def testFencedCodeWithHighlightLines(self): if has_pygments: expected = self.dedent( diff -Nru python-markdown-3.3.4/tests/test_syntax/extensions/test_md_in_html.py python-markdown-3.3.6/tests/test_syntax/extensions/test_md_in_html.py --- python-markdown-3.3.4/tests/test_syntax/extensions/test_md_in_html.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/tests/test_syntax/extensions/test_md_in_html.py 2021-11-17 15:59:35.000000000 +0000 @@ -283,6 +283,26 @@ ) ) + def text_md1_details(self): + self.assertMarkdownRenders( + self.dedent( + """ +

Click to expand

+ *foo* +

+ """ + ), + self.dedent( + """ +

Click to expand

foo

+ """ + ) + ) + def test_md1_mix(self): self.assertMarkdownRenders( self.dedent( diff -Nru python-markdown-3.3.4/tests/test_syntax/extensions/test_toc.py python-markdown-3.3.6/tests/test_syntax/extensions/test_toc.py --- python-markdown-3.3.4/tests/test_syntax/extensions/test_toc.py 2021-02-24 19:57:42.000000000 +0000 +++ python-markdown-3.3.6/tests/test_syntax/extensions/test_toc.py 2021-11-17 15:59:35.000000000 +0000 @@ -21,6 +21,7 @@ from markdown.test_tools import TestCase from markdown.extensions.toc import TocExtension +from markdown.extensions.nl2br import Nl2BrExtension class TestTOC(TestCase): @@ -534,9 +535,9 @@ from markdown.extensions.toc import slugify_unicode self.assertMarkdownRenders( '# Unicode ヘッダー', - '

' # noqa + '

' # noqa 'Unicode ヘッダー' # noqa - '¶' # noqa + '¶' # noqa '

', # noqa extensions=[TocExtension(permalink=True, slugify=slugify_unicode)] ) @@ -545,9 +546,26 @@ from markdown.extensions.toc import slugify_unicode self.assertMarkdownRenders( '# Unicode ヘッダー', - '

' # noqa + '

' # noqa 'Unicode ヘッダー' # noqa - '¶' # noqa + '¶' # noqa '

', # noqa extensions=[TocExtension(permalink=True, permalink_title="パーマリンク", slugify=slugify_unicode)] ) + + def testPermalinkWithExtendedLatinInID(self): + self.assertMarkdownRenders( + '# Théâtre', + '

' # noqa + 'Théâtre' # noqa + '¶' # noqa + '

', # noqa + extensions=[TocExtension(permalink=True)] + ) + + def testNl2brCompatibility(self): + self.assertMarkdownRenders( + '[TOC]\ntext', + '

[TOC]
\ntext

', + extensions=[TocExtension(), Nl2BrExtension()] + ) diff -Nru python-markdown-3.3.4/tests/test_syntax/inline/test_autolinks.py python-markdown-3.3.6/tests/test_syntax/inline/test_autolinks.py --- python-markdown-3.3.4/tests/test_syntax/inline/test_autolinks.py 1970-01-01 00:00:00.000000000 +0000 +++ python-markdown-3.3.6/tests/test_syntax/inline/test_autolinks.py 2021-11-17 15:59:35.000000000 +0000 @@ -0,0 +1,63 @@ +""" +Python Markdown + +A Python implementation of John Gruber's Markdown. + +Documentation: https://python-markdown.github.io/ +GitHub: https://github.com/Python-Markdown/markdown/ +PyPI: https://pypi.org/project/Markdown/ + +Started by Manfred Stienstra (http://www.dwerg.net/). +Maintained for a few years by Yuri Takhteyev (http://www.freewisdom.org). +Currently maintained by Waylan Limberg (https://github.com/waylan), +Dmitry Shachnev (https://github.com/mitya57) and Isaac Muse (https://github.com/facelessuser). + +Copyright 2007-2021 The Python Markdown Project (v. 1.7 and later) +Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b) +Copyright 2004 Manfred Stienstra (the original version) + +License: BSD (see LICENSE.md for details). +""" + +from markdown.test_tools import TestCase + + +class TestAutomaticLinks(TestCase): + + def test_email_address(self): + self.assertMarkdownRenders( + 'asdfasdfadsfasd or you can say ', + '

asdfasdfadsfasd yuri@freewisd' + 'om.org or you can say

' + ) + + def test_mailto_email_address(self): + self.assertMarkdownRenders( + 'instead ', + '

instead ' + 'yuri@freewisdom' + '.org

' + ) + + def test_email_address_with_ampersand(self): + self.assertMarkdownRenders( + '', + '

bob&' + 'sue@example.com

' + ) + + def test_invalid_email_address_local_part(self): + self.assertMarkdownRenders( + 'Missing local-part <@domain>', + '

Missing local-part <@domain>

' + ) + + def test_invalid_email_address_domain(self): + self.assertMarkdownRenders( + 'Missing domain ', + '

Missing domain <local-part@>

' + )