Merge branch 'release/2.3.14'

Author: ikirudennis

CHANGELOG.textile

@@ -1,5 +1,8 @@
 h1. Textile Changelog
 
+h2. Version 2.3.14
+* Bugfix: Fix textile on Python 2.6 ("#48":https://github.com/textile/python-textile/issues/48)
+
 h2. Version 2.3.13
 * Remove extraneous arguments from textile method. These were originally added long ago to work with django, but markup languages are long gone from django.
 * Bugfix: Don't mangle percent-encoded URLs so much. ("#45":https://github.com/textile/python-textile/issues/45)

textile/utils.py

@@ -111,7 +111,7 @@ def list_type(list_string):
 def normalize_newlines(string):
     out = string.strip()
     out = re.sub(r'\r\n?', '\n', out)
-    out = re.sub(r'^[ \t]*\n', '\n', out, flags=re.M)
+    out = re.compile(r'^[ \t]*\n', flags=re.M).sub('\n', out)
     out = re.sub(r'"$', '" ', out)
     return out
 

textile/version.py

@@ -1 +1 @@
-VERSION = '2.3.13'
+VERSION = '2.3.14'