From 499ce52304b8994500ba0e81bd23d9ac6a2038cf Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Tue, 1 Jan 2019 10:40:29 -0800 Subject: [PATCH] Remove unused compat entries Organize both the Python2 & Python3 sections in the same order so they are easier to compare. Removed: - basestring - ifilter - bytes --- tablib/compat.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tablib/compat.py b/tablib/compat.py index d60ce72..2f97650 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -22,19 +22,14 @@ except ImportError: if is_py3: from io import BytesIO - from itertools import zip_longest as izip_longest - from statistics import median + from io import StringIO from tablib.packages import markup3 as markup + from statistics import median + from itertools import zip_longest as izip_longest + import csv import tablib.packages.dbfpy3 as dbfpy - import csv - from io import StringIO - # py3 mappings - - ifilter = filter unicode = str - bytes = bytes - basestring = str xrange = range else: @@ -42,8 +37,7 @@ else: from cStringIO import StringIO from tablib.packages import markup from tablib.packages.statistics import median - from itertools import ifilter, izip_longest - + from itertools import izip_longest import unicodecsv as csv import tablib.packages.dbfpy as dbfpy