maybe now's the time to remove py26

Author: ikirudennis

.travis.yml

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

textile/utils.py

@@ -62,26 +62,12 @@ def generate_tag(tag, content, attributes=None):
     # 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.
-    try:
-        element_tag = ElementTree.tostringlist(element, encoding=enc,
-                method='html')
-        if six.PY2:
-            element_tag = [v.decode(enc) for v in 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.
-        attributes = dict(map(lambda (k, v): (k, six.text_type(v)),
-            six.iteritems(attributes)))
-        element = ElementTree.Element(tag, attrib=attributes)
-        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)
+    element_tag = ElementTree.tostringlist(element, encoding=enc,
+            method='html')
+    if six.PY2:
+        element_tag = [v.decode(enc) for v in element_tag]
+    element_tag.insert(len(element_tag) - 1, content)
+    element_text = ''.join(element_tag)
     return element_text
 
 def has_raw_text(text):