compat module

tablib/__init__.py

@@ -1,7 +1,7 @@
 """ Tablib.
 """
 
-from tablib.compat import (
+from tablib.core import (
     Databook, Dataset, detect, import_set,
     InvalidDatasetType, InvalidDimensions, UnsupportedFormat
 )

tablib/compat.py

@@ -10,9 +10,24 @@ Tablib compatiblity module.
 
 import sys
 
+is_py3 = (sys.version_info[0] > 2)
+
+
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from tablib.packages.ordereddict import OrderedDict
+
+
+if is_py3:
+    from io import BytesIO
+    import tablib.packages.xlwt3 as xlwt
+    from tablib.packages import markup3 as markup
+
+else:
+    from cStringIO import StringIO as BytesIO
+    import tablib.packages.xlwt as xlwt
+    from tablib.packages import markup
 
-from tablib.core import (
-    Databook, Dataset, detect, import_set,
-    InvalidDatasetType, InvalidDimensions, UnsupportedFormat
-)
 

tablib/core.py

@@ -15,10 +15,8 @@ from operator import itemgetter
 from tablib import formats
 import collections
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from tablib.packages.ordereddict import OrderedDict
+
+from tablib.compat import OrderedDict
 
 
 __title__ = 'tablib'
@@ -795,7 +793,7 @@ def import_set(stream):
         format.import_set(data, stream)
         return data
 
-    except AttributeError as e:
+    except AttributeError:
         return None
 
 

tablib/formats/_xls.py

@@ -5,15 +5,7 @@
 
 import sys
 
-
-if sys.version_info[0] > 2:
-    from io import BytesIO
-    import tablib.packages.xlwt3 as xlwt
-    
-else:
-    from cStringIO import StringIO as BytesIO
-    import tablib.packages.xlwt as xlwt
-
+from tablib.compat import BytesIO, xlwt
 
 
 title = 'xls'