Merge branch 'release/2.2.2'

textile · Jan 30, 2015 · 13948a1 · 13948a1
2 parents c109627 + 0a472d0
commit 13948a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/textile/core.py b/textile/core.py
@@ -436,7 +436,11 @@ def hasRawText(self, text):
         True
 
         """
-        r = re.compile(r'<(p|blockquote|div|form|table|ul|ol|dl|pre|h\d)[^>]*?>.*</\1>',
+        # The php version has orders the below list of tags differently.  The
+        # important thing to note here is that the pre must occur before the
+        # p or else the regex module doesn't properly match pre-s. It only
+        # matches the p in pre.
+        r = re.compile(r'<(pre|p|blockquote|div|form|table|ul|ol|dl|h[1-6])[^>]*?>.*</\1>',
                        re.S).sub('', text.strip()).strip()
         r = re.compile(r'<(hr|br)[^>]*?/>').sub('', r)
         return '' != r

diff --git a/textile/version.py b/textile/version.py
@@ -1 +1 @@
-VERSION = '2.2.1'
+VERSION = '2.2.2'