[Python-modules-commits] [python-markdown] 01/05: Import python-markdown_2.6.4.orig.tar.gz

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch master
in repository python-markdown.

commit 68e168093a0a374d305b0faa5e3b79ef8d52a3eb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Nov 13 17:49:42 2015 +0300

    Import python-markdown_2.6.4.orig.tar.gz
---
 PKG-INFO                     | 4 ++--
 docs/change_log.txt          | 2 ++
 markdown/__version__.py      | 2 +-
 markdown/inlinepatterns.py   | 2 +-
 tests/extensions/smarty.html | 4 +++-
 tests/extensions/smarty.txt  | 3 +++
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 509ccee..46da8ef 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: Markdown
-Version: 2.6.3
+Version: 2.6.4
 Summary: Python implementation of Markdown.
 Home-page: https://pythonhosted.org/Markdown/
 Author: Waylan Limberg
 Author-email: waylan.limberg [at] icloud.com
 License: BSD License
-Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-2.6.3.tar.gz
+Download-URL: http://pypi.python.org/packages/source/M/Markdown/Markdown-2.6.4.tar.gz
 Description: 
         This is a Python implementation of John Gruber's Markdown_.
         It is almost completely compliant with the reference implementation,
diff --git a/docs/change_log.txt b/docs/change_log.txt
index 676d56d..ee33e6c 100644
--- a/docs/change_log.txt
+++ b/docs/change_log.txt
@@ -7,6 +7,8 @@ next_url:   release-2.6.html
 Python-Markdown Change Log
 =========================
 
+Nov 6, 2015: Released version 2.6.4 (a bug-fix release).
+
 Oct 26, 2015: Released version 2.6.3 (a bug-fix release).
 
 Apr 20, 2015: Released version 2.6.2 (a bug-fix release).
diff --git a/markdown/__version__.py b/markdown/__version__.py
index f7c1099..6830fc7 100644
--- a/markdown/__version__.py
+++ b/markdown/__version__.py
@@ -5,7 +5,7 @@
 # (major, minor, micro, alpha/beta/rc/final, #)
 # (1, 1, 2, 'alpha', 0) => "1.1.2.dev"
 # (1, 2, 0, 'beta', 2) => "1.2b2"
-version_info = (2, 6, 3, 'final', 0)
+version_info = (2, 6, 4, 'final', 0)
 
 
 def _get_version():
diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py
index 95d358d..dcf4ad4 100644
--- a/markdown/inlinepatterns.py
+++ b/markdown/inlinepatterns.py
@@ -198,7 +198,7 @@ class Pattern(object):
 
         """
         self.pattern = pattern
-        self.compiled_re = re.compile("^(.*?)%s(.*?)$" % pattern,
+        self.compiled_re = re.compile("^(.*?)%s(.*)$" % pattern,
                                       re.DOTALL | re.UNICODE)
 
         # Api for Markdown to pass safe_mode into instance
diff --git a/tests/extensions/smarty.html b/tests/extensions/smarty.html
index 50cf774..e37e377 100644
--- a/tests/extensions/smarty.html
+++ b/tests/extensions/smarty.html
@@ -27,4 +27,6 @@ Escaped ellipsis...</p>
 <p>Skip <code><<all>> "code" -- --- 'spans' ...</code>.</p>
 <pre><code>Also skip "code" 'blocks'
 foo -- bar --- baz ...
-</code></pre>
\ No newline at end of file
+</code></pre>
+<p>A line that ‘wraps’ with
+<em>emphasis</em> at the beginning of the next line.</p>
\ No newline at end of file
diff --git a/tests/extensions/smarty.txt b/tests/extensions/smarty.txt
index f2f4041..12e5c95 100644
--- a/tests/extensions/smarty.txt
+++ b/tests/extensions/smarty.txt
@@ -35,3 +35,6 @@ Skip `<<all>> "code" -- --- 'spans' ...`.
 
     Also skip "code" 'blocks'
 	foo -- bar --- baz ...
+
+A line that 'wraps' with
+*emphasis* at the beginning of the next line.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-markdown.git