Merge branch 'master' into bugfix/invalid-ascii-csv

# Conflicts:
#	setup.py
#	tablib/compat.py
#	test_tablib.py

1 files changed, 6 insertions, 16 deletions

diff --git a/tablib/compat.py b/tablib/compat.py
index d18a781..660697d 100644
--- a/tablib/compat.py
+++ b/tablib/compat.py
@@ -13,34 +13,24 @@ 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
+    from io import StringIO
     from tablib.packages import markup3 as markup
-    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 StringIO import StringIO
     from tablib.packages import markup
-    from itertools import ifilter
-
+    from tablib.packages.statistics import median
+    from itertools import izip_longest
     from backports import csv
     import tablib.packages.dbfpy as dbfpy