[Python-modules-commits] r29383 - in packages/python-markdown/trunk/debian (2 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Wednesday, June 18, 2014 @ 16:15:46
  Author: mitya57-guest
Revision: 29383

Update smarty_fixes.patch with one more fix from upstream.

Modified:
  packages/python-markdown/trunk/debian/changelog
  packages/python-markdown/trunk/debian/patches/smarty_fixes.patch

Modified: packages/python-markdown/trunk/debian/changelog
===================================================================
--- packages/python-markdown/trunk/debian/changelog	2014-06-18 16:10:09 UTC (rev 29382)
+++ packages/python-markdown/trunk/debian/changelog	2014-06-18 16:15:46 UTC (rev 29383)
@@ -6,8 +6,9 @@
   [ Dmitry Shachnev ]
   * Simplify debian/rules.
   * Backport doctests fixes from upstream.
+  * Update smarty_fixes.patch with one more fix from upstream.
 
- -- Andrey Rahmatullin <wrar at wrar.name>  Fri, 30 May 2014 23:36:50 +0600
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 18 Jun 2014 20:15:24 +0400
 
 python-markdown (2.4.1-1) unstable; urgency=medium
 

Modified: packages/python-markdown/trunk/debian/patches/smarty_fixes.patch
===================================================================
--- packages/python-markdown/trunk/debian/patches/smarty_fixes.patch	2014-06-18 16:10:09 UTC (rev 29382)
+++ packages/python-markdown/trunk/debian/patches/smarty_fixes.patch	2014-06-18 16:15:46 UTC (rev 29383)
@@ -1,6 +1,9 @@
 Description: Make smarty extension use its own InlineProcessor
-Origin: upstream, https://github.com/waylan/Python-Markdown/pull/311
-Last-Update: 2014-05-27
+Origin: upstream, commits:
+ https://github.com/waylan/Python-Markdown/commit/54527a062fd4fe
+ https://github.com/waylan/Python-Markdown/commit/47ec0cb1ea3112
+ https://github.com/waylan/Python-Markdown/commit/cd076d004e9a66
+Last-Update: 2014-06-18
 
 --- a/markdown/extensions/smarty.py
 +++ b/markdown/extensions/smarty.py
@@ -44,12 +47,14 @@
      def extendMarkdown(self, md, md_globals):
          configs = self.getConfigs()
 +        self.inlinePatterns = OrderedDict()
++        if configs['smart_ellipses']:
++            self.educateEllipses(md)
          if configs['smart_quotes']:
              self.educateQuotes(md)
          if configs['smart_dashes']:
              self.educateDashes(md)
-         if configs['smart_ellipses']:
-             self.educateEllipses(md)
+-        if configs['smart_ellipses']:
+-            self.educateEllipses(md)
 +        inlineProcessor = InlineProcessor(md)
 +        inlineProcessor.inlinePatterns = self.inlinePatterns
 +        md.treeprocessors.add('smarty', inlineProcessor, '_end')