I've rethought py2.6; giving it one last try.

Author: ikirudennis

.travis.yml

@@ -3,6 +3,7 @@ env:
   - REQUIREMENTS=true
   - REQUIREMENTS=false
 python:
+  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"

README.textile

@@ -43,4 +43,4 @@ h2. Usage
 
 h3. Notes:
 
-* Active development supports Python 2.7 or later (including Python 3.2+).
+* Active development supports Python 2.6 or later (including Python 3.2+).

setup.py

@@ -26,6 +26,7 @@ def get_version():
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
@@ -36,6 +37,7 @@ def get_version():
     keywords='textile,text,html markup',
     install_requires=['six',],
     extras_require={
+        ':python_version=="2.6"': ['ordereddict>=1.1'],
         'develop': ['regex', 'pytest', 'pytest-cov'],
     },
     setup_requires=['pytest-runner'],

textile/__init__.py

@@ -1,8 +1,20 @@
 from __future__ import unicode_literals
 
+import sys
+import warnings
+
 from .core import textile, textile_restricted, Textile
 from .version import VERSION
 
 __all__ = ['textile', 'textile_restricted']
 
 __version__ = VERSION
+
+
+if sys.version_info[:2] == (2, 6):
+    warnings.warn(
+        "Python 2.6 is no longer supported by the Python core team, please "
+        "upgrade your Python. A future version of cryptography will drop "
+        "support for Python 2.6",
+        DeprecationWarning
+    )

textile/core.py

@@ -31,7 +31,10 @@
 from textile.objects import Block, Table
 
 
-from collections import OrderedDict
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 from six.moves import urllib
 urlparse, urlsplit, urlunsplit, quote, unquote = (urllib.parse.urlparse,
@@ -871,6 +874,7 @@ def _casesdefault(c, pop, popped, url_chars, counts, pre):
         url = self.shelveURL(self.encode_url(urlunsplit(uri_parts)))
         attributes = parse_attributes(atts)
         if title:
+            title = title.encode('utf8')
             attributes['title'] = title
         attributes['href'] = url
         if self.rel:

textile/objects/block.py

@@ -1,5 +1,7 @@
-from collections import OrderedDict
-
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 try:
     import regex as re
 except ImportError:

textile/utils.py

@@ -10,7 +10,10 @@
 urlparse = urllib.parse.urlparse
 HTMLParser = html_parser.HTMLParser
 
-from collections import OrderedDict
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 from xml.etree import ElementTree
 
@@ -47,22 +50,33 @@ def generate_tag(tag, content, attributes=None):
     content are strings, the attributes argument is a dictionary.  As
     a convenience, if the content is ' /', a self-closing tag is generated."""
     content = six.text_type(content)
-    element = ElementTree.Element(tag, attrib=attributes)
     enc = 'unicode'
     if six.PY2:
         enc = 'UTF-8'
+        attributes = OrderedDict((k, v.decode('utf8')) for k, v in attributes.items())
     if not tag:
         return content
+    element = ElementTree.Element(tag, attrib=attributes)
     # FIXME: Kind of an ugly hack.  There *must* be a cleaner way.  I tried
     # adding text by assigning it to element_tag.text.  That results in
     # non-ascii text being html-entity encoded.  Not bad, but not entirely
     # matching php-textile either.
-    element_tag = ElementTree.tostringlist(element, encoding=enc,
-            method='html')
-    if six.PY2:
+    try:
+        element_tag = ElementTree.tostringlist(element, encoding=enc,
+                method='html')
         element_tag = [v.decode('utf8') for v in element_tag]
-    element_tag.insert(len(element_tag) - 1, content)
-    element_text = ''.join(element_tag)
+        element_tag.insert(len(element_tag) - 1, content)
+        element_text = ''.join(element_tag)
+    except AttributeError:
+        # Python 2.6 doesn't have the tostringlist method, so we have to treat
+        # it differently.
+        element_tag = ElementTree.tostring(element, encoding=enc)
+        element_text = re.sub(r"<\?xml version='1.0' encoding='UTF-8'\?>\n",
+                '', element_tag)
+        if content != six.text_type(' /'):
+            element_text = element_text.rstrip(' />')
+            element_text = six.text_type('{0}>{1}</{2}>').format(six.text_type(
+                element_text), content, tag)
     return element_text
 
 def has_raw_text(text):