diff --git a/tablib/packages/openpyxl/cell.py b/tablib/packages/openpyxl/cell.py index ec5e74e..757a834 100644 --- a/tablib/packages/openpyxl/cell.py +++ b/tablib/packages/openpyxl/cell.py @@ -42,7 +42,6 @@ from .shared.date_time import SharedDate from .shared.exc import CellCoordinatesException, \ ColumnStringIndexException, DataTypeException from .style import NumberFormat -from ...compat import basestring, unicode # constants COORD_RE = re.compile('^[$]?([A-Z]+)[$]?(\d+)$') diff --git a/tablib/packages/openpyxl/reader/iter_worksheet.py b/tablib/packages/openpyxl/reader/iter_worksheet.py index 781c0ca..7b3bc04 100644 --- a/tablib/packages/openpyxl/reader/iter_worksheet.py +++ b/tablib/packages/openpyxl/reader/iter_worksheet.py @@ -31,8 +31,7 @@ from ....compat import BytesIO as StringIO import warnings import operator from functools import partial -from ....compat import ifilter, xrange -from itertools import groupby +from itertools import groupby, ifilter from ..worksheet import Worksheet from ..cell import coordinate_from_string, get_column_letter, Cell from ..reader.excel import get_sheet_ids