drop more py26 code and don't revert the fix for #30.

Author: ikirudennis

textile/core.py

@@ -31,10 +31,7 @@
 from textile.objects import Block, Table
 
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
 from six.moves import urllib
 urlparse, urlsplit, urlunsplit, quote, unquote = (urllib.parse.urlparse,

textile/utils.py

@@ -10,10 +10,7 @@
 urlparse = urllib.parse.urlparse
 HTMLParser = html_parser.HTMLParser
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
 from xml.etree import ElementTree
 
@@ -60,8 +57,8 @@ 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.
-    element_tag = ElementTree.tostringlist(element, encoding=enc,
-            method='html')
+    element_tag = [v.decode(enc) for v in ElementTree.tostringlist(element, encoding=enc,
+            method='html')]
     element_tag.insert(len(element_tag) - 1, content)
     element_text = ''.join(element_tag)
     return element_text