Merge branch 'master' into master

1 files changed, 8 insertions, 28 deletions

diff --git a/tablib/compat.py b/tablib/compat.py
index 2593e36..660697d 100644
--- a/tablib/compat.py
+++ b/tablib/compat.py
@@ -13,45 +13,25 @@ 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
-    import tablib.packages.xlrd3 as xlrd
-    from tablib.packages.xlrd3.biffh import XLRDError
+    from io import StringIO
     from tablib.packages import markup3 as markup
-    from tablib.packages import openpyxl3 as openpyxl
-    from tablib.packages.odf3 import opendocument, style, text, table
-    import tablib.packages.dbfpy3 as dbfpy
-
+    from statistics import median
+    from itertools import zip_longest as izip_longest
     import csv
-    from io import StringIO
-    # py3 mappings
+    import tablib.packages.dbfpy3 as dbfpy
 
-    ifilter = filter
     unicode = str
-    bytes = bytes
-    basestring = str
     xrange = range
 
 else:
     from cStringIO import StringIO as BytesIO
-    from cStringIO import StringIO
-    import tablib.packages.xlwt as xlwt
-    import tablib.packages.xlrd as xlrd
-    from tablib.packages.xlrd.biffh import XLRDError
+    from StringIO import StringIO
     from tablib.packages import markup
-    from itertools import ifilter
-    from tablib.packages import openpyxl
-    from tablib.packages.odf import opendocument, style, text, table
-
-    from tablib.packages import unicodecsv as csv
+    from tablib.packages.statistics import median
+    from itertools import izip_longest
+    from backports import csv
     import tablib.packages.dbfpy as dbfpy
 
     unicode = unicode