From 5db95251ad52b39fe85b5fc345815306704c451f Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Tue, 11 Mar 2014 12:39:28 +0400
Subject: smarty: Pass tuples, not iterable strings to the pattern.

---
 markdown/extensions/smarty.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/markdown/extensions/smarty.py b/markdown/extensions/smarty.py
index f452afc..0557a54 100644
--- a/markdown/extensions/smarty.py
+++ b/markdown/extensions/smarty.py
@@ -150,14 +150,14 @@ class SmartyExtension(Extension):
             md.inlinePatterns.add(name, pattern, after)
 
     def educateDashes(self, md):
-        emDashesPattern = SubstituteTextPattern(r'(?<!-)---(?!-)', '&mdash;', md)
-        enDashesPattern = SubstituteTextPattern(r'(?<!-)--(?!-)', '&ndash;', md)
+        emDashesPattern = SubstituteTextPattern(r'(?<!-)---(?!-)', ('&mdash;',), md)
+        enDashesPattern = SubstituteTextPattern(r'(?<!-)--(?!-)', ('&ndash;',), md)
         md.inlinePatterns.add('smarty-em-dashes', emDashesPattern, '>entity')
         md.inlinePatterns.add('smarty-en-dashes', enDashesPattern,
             '>smarty-em-dashes')
 
     def educateEllipses(self, md):
-        ellipsesPattern = SubstituteTextPattern(r'(?<!\.)\.{3}(?!\.)', '&hellip;', md)
+        ellipsesPattern = SubstituteTextPattern(r'(?<!\.)\.{3}(?!\.)', ('&hellip;',), md)
         md.inlinePatterns.add('smarty-ellipses', ellipsesPattern, '>entity')
 
     def educateQuotes(self, md):
-- 
cgit v1.2.3


From 4ca11effd18372dc6b5e8cf852130a7e75c27eb6 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Tue, 11 Mar 2014 20:48:19 +0400
Subject: smarty: Fix test failure with Python 3.1 and 3.2. Fixes #295

---
 markdown/extensions/smarty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markdown/extensions/smarty.py b/markdown/extensions/smarty.py
index 0557a54..2f946f8 100644
--- a/markdown/extensions/smarty.py
+++ b/markdown/extensions/smarty.py
@@ -73,7 +73,7 @@ from ..util import parseBoolValue
 # Constants for quote education.
 punctClass = r"""[!"#\$\%'()*+,-.\/:;<=>?\@\[\\\]\^_`{|}~]"""
 endOfWordClass = r"[\s.,;:!?)]"
-closeClass = r"[^\ \t\r\n\[\{\(\-\u0002\u0003]"
+closeClass = "[^\ \t\r\n\[\{\(\-\u0002\u0003]"
 
 openingQuotesBase = (
    '(\s'              # a  whitespace char
-- 
cgit v1.2.3