subtle format cleanups

tablib/compat.py

@@ -22,9 +22,11 @@ except ImportError:
 
 if is_py3:
     from io import BytesIO
+    from io import StringIO
     import tablib.packages.xlwt3 as xlwt
     from tablib.packages import markup3 as markup
     from tablib.packages import openpyxl3 as openpyxl
+    import csv
 
     # py3 mappings
 
@@ -34,9 +36,11 @@ if is_py3:
 
 else:
     from cStringIO import StringIO as BytesIO
+    from cStringIO import StringIO
     import tablib.packages.xlwt as xlwt
     from tablib.packages import markup
     from itertools import ifilter
     from tablib.packages import openpyxl
+    import tablib.packages.unicodecsv as csv
 
-
+    unicode = unicode

tablib/formats/_csv.py

@@ -3,22 +3,11 @@
 """ Tablib - CSV Support.
 """
 
-import sys
-if sys.version_info[0] > 2:
-    is_py3 = True
-
-    from io import StringIO
-    import csv
-else:
-    is_py3 = False
-    from cStringIO import StringIO
-    import tablib.packages.unicodecsv as csv
-
-
 
 import os
 
 import tablib
+from tablib.compat import is_py3, StringIO, csv
 
 
 title = 'csv'

tablib/formats/_tsv.py

@@ -3,20 +3,11 @@
 """ Tablib - TSV (Tab Separated Values) Support.
 """
 
-import sys
-if sys.version_info[0] > 2:
-    is_py3 = True
-    from io import StringIO
-    import csv
-else:
-    is_py3 = False
-    from cStringIO import StringIO
-    import tablib.packages.unicodecsv as csv
-
-
 import os
 
 import tablib
+from tablib.compat import is_py3, csv, StringIO
+
 
 
 title = 'tsv'