Moved OrderedDict importing to compat.py

flask_toybox/__init__.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 
 from .serialization import JSON
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from .compat import OrderedDict
 
 class ToyBox(object):
     def __init__(self, app):

flask_toybox/compat.py

@@ -0,0 +1,9 @@
+"""
+Cross-version compatibility module.
+"""
+
+from __future__ import absolute_import
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict

flask_toybox/serialization.py

@@ -7,11 +7,9 @@
 *deserializers*. The names are hopefully self-describing.
 """
 
+from __future__ import absolute_import
 import json
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from .compat import OrderedDict
 import decimal
 
 class ExtendedJSONEncoder(json.JSONEncoder):

flask_toybox/sqlalchemy.py

@@ -11,10 +11,7 @@
 
 from __future__ import absolute_import
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from .compat import OrderedDict
 from sqlalchemy.orm import column_property, class_mapper, relationship, ColumnProperty, object_session
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.schema import Column