merge py26 branch

Author: ikirudennis

README.textile

@@ -4,7 +4,7 @@ python-textile is a Python port of Textile, Dean Allen's humane web text generat
 
 h2. Usage
 
-Install the 'textile' folder on your python path, or @pip install https://github.com/ikirudennis/python-textile/archive/v2.1.6.tar.gz@
+Install the 'textile' folder on your python path, or @pip install https://github.com/ikirudennis/python-textile/archive/v2.1.6-py26.tar.gz@
 
 <pre>
 <code>

textile/functions.py

@@ -21,11 +21,18 @@
 import re
 import uuid
 from sys import maxunicode, version_info
-from collections import OrderedDict
 
 from textile.tools import sanitizer, imagesize
 
 
+# We're going to use the Python 2.7+ OrderedDict data type. Import it if it's
+# available, otherwise, use the included tool.
+try:
+    from collections import OrderedDict
+except ImportError:
+    from textile.tools import OrderedDict
+
+
 try:
     # Python 3
     from urllib.parse import urlparse, urlsplit, urlunsplit, quote, unquote
@@ -473,8 +480,11 @@ def fTable(self, match):
         colgrp, last_rgrp = '', ''
         c_row = 1
         rows = []
-        for row in [x for x in re.split(r'\|\s*?$', match.group(3), flags=re.M)
-                    if x]:
+        try:
+            split = re.split(r'\|\s*?$', match.group(3), flags=re.M)
+        except TypeError:
+            split = re.compile(r'\|\s*?$', re.M).split(match.group(3))
+        for row in [x for x in split if x]:
             row = row.lstrip()
 
             # Caption -- only occurs on row 1, otherwise treat '|=. foo |...'
@@ -608,7 +618,10 @@ def lists(self, text):
         return pattern.sub(self.fList, bullet_pattern.sub('*', text))
 
     def fList(self, match):
-        text = re.split(r'\n(?=[*#;:])', match.group(), flags=re.M)
+        try:
+            text = re.split(r'\n(?=[*#;:])', match.group(), flags=re.M)
+        except TypeError:
+            text = re.compile(r'\n(?=[*#;:])', re.M).split(match.group())
         pt = ''
         result = []
         ls = OrderedDict()
@@ -1445,7 +1458,10 @@ def redcloth_list(self, text):
     def fRCList(self, match):
         """Format a definition list."""
         out = []
-        text = re.split(r'\n(?=[-])', match.group(), flags=re.M)
+        try:
+            text = re.split(r'\n(?=[-])', match.group(), flags=re.M)
+        except TypeError:
+            text = re.compile(r'\n(?=[-])', re.M).split(match.group())
         for line in text:
             # parse the attributes and content
             m = re.match(r'^[-]+(%s)[ .](.*)$' % self.lc, line, re.M | re.S)