Clean up imports

Author: ikirudennis

textile/functions.py

@@ -21,6 +21,9 @@
 import re
 import uuid
 from sys import maxunicode, version_info
+from collections import OrderedDict
+
+from textile.tools import sanitizer, imagesize
 
 
 try:
@@ -36,15 +39,6 @@
     from urlparse import urlparse, urlsplit, urlunsplit
     from HTMLParser import HTMLParser
 
-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
-
 
 def _normalize_newlines(string):
     out = string.strip()