diff --git a/pandas/_libs/parsers.pyx b/pandas/_libs/parsers.pyx index 88bb00cb54319..cffeb44b50910 100644 --- a/pandas/_libs/parsers.pyx +++ b/pandas/_libs/parsers.pyx @@ -698,7 +698,7 @@ cdef class TextReader: if ptr == NULL: if not os.path.exists(source): - raise compat.FileNotFoundError( + raise FileNotFoundError( ENOENT, 'File {source} does not exist'.format(source=source), source) diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py index 4036af85b7212..3a811ba7706c9 100644 --- a/pandas/compat/__init__.py +++ b/pandas/compat/__init__.py @@ -5,7 +5,7 @@ Cross-compatible functions for Python 2 and 3. Key items to import for 2/3 compatible code: -* iterators: range(), map(), zip(), filter(), reduce() +* iterators: reduce() * lists: lrange(), lmap(), lzip(), lfilter() * unicode: u() [no unicode builtin in Python 3] * longs: long (int in Python 3) @@ -107,19 +107,11 @@ def get_range_parameters(data): return data.start, data.stop, data.step # have to explicitly put builtins into the namespace - range = range - map = map - zip = zip - filter = filter intern = sys.intern reduce = functools.reduce long = int unichr = chr - # This was introduced in Python 3.3, but we don't support - # Python 3.x < 3.5, so checking PY3 is safe. - FileNotFoundError = FileNotFoundError - # list-producing versions of the major Python iterating functions def lrange(*args, **kwargs): return list(range(*args, **kwargs)) @@ -148,8 +140,6 @@ def lfilter(*args, **kwargs): # Python 2 _name_re = re.compile(r"[a-zA-Z_][a-zA-Z0-9_]*$") - FileNotFoundError = IOError - def isidentifier(s, dotted=False): return bool(_name_re.match(s)) @@ -181,11 +171,7 @@ def get_range_parameters(data): return start, stop, step # import iterator versions of these functions - range = xrange intern = intern - zip = itertools.izip - filter = itertools.ifilter - map = itertools.imap reduce = reduce long = long unichr = unichr @@ -217,7 +203,6 @@ def iterkeys(obj, **kw): def itervalues(obj, **kw): return obj.itervalues(**kw) - next = lambda it: it.next() else: def iteritems(obj, **kw): return iter(obj.items(**kw)) @@ -228,8 +213,6 @@ def iterkeys(obj, **kw): def itervalues(obj, **kw): return iter(obj.values(**kw)) - next = next - def bind_method(cls, name, func): """Bind a method to class, python 2 and python 3 compatible. @@ -315,9 +298,6 @@ def set_function_name(f, name, cls): name=name) f.__module__ = cls.__module__ return f - - ResourceWarning = ResourceWarning - else: string_types = basestring, integer_types = (int, long) @@ -373,9 +353,6 @@ def set_function_name(f, name, cls): f.__name__ = name return f - class ResourceWarning(Warning): - pass - string_and_binary_types = string_types + (binary_type,) diff --git a/pandas/core/arrays/integer.py b/pandas/core/arrays/integer.py index 0144d04c6e197..92505bd193a49 100644 --- a/pandas/core/arrays/integer.py +++ b/pandas/core/arrays/integer.py @@ -5,7 +5,7 @@ import numpy as np from pandas._libs import lib -from pandas.compat import range, set_function_name, string_types +from pandas.compat import set_function_name, string_types from pandas.util._decorators import cache_readonly from pandas.core.dtypes.base import ExtensionDtype diff --git a/pandas/core/arrays/period.py b/pandas/core/arrays/period.py index 55d12d444fb45..400d4c9b93da2 100644 --- a/pandas/core/arrays/period.py +++ b/pandas/core/arrays/period.py @@ -934,14 +934,14 @@ def _range_from_fields(year=None, month=None, quarter=None, day=None, raise AssertionError("base must equal FR_QTR") year, quarter = _make_field_arrays(year, quarter) - for y, q in compat.zip(year, quarter): + for y, q in zip(year, quarter): y, m = libperiod.quarter_to_myear(y, q, freq) val = libperiod.period_ordinal(y, m, 1, 1, 1, 1, 0, 0, base) ordinals.append(val) else: base, mult = libfrequencies.get_freq_code(freq) arrays = _make_field_arrays(year, month, day, hour, minute, second) - for y, mth, d, h, mn, s in compat.zip(*arrays): + for y, mth, d, h, mn, s in zip(*arrays): ordinals.append(libperiod.period_ordinal( y, mth, d, h, mn, s, 0, 0, base)) diff --git a/pandas/core/base.py b/pandas/core/base.py index ce91c232bb92d..60ab13ac4f09d 100644 --- a/pandas/core/base.py +++ b/pandas/core/base.py @@ -9,7 +9,7 @@ import pandas._libs.lib as lib import pandas.compat as compat -from pandas.compat import PYPY, builtins, map, range +from pandas.compat import PYPY, builtins from pandas.compat.numpy import function as nv from pandas.errors import AbstractMethodError from pandas.util._decorators import Appender, Substitution, cache_readonly diff --git a/pandas/core/computation/align.py b/pandas/core/computation/align.py index 951174648091f..71b57ec4ecd1e 100644 --- a/pandas/core/computation/align.py +++ b/pandas/core/computation/align.py @@ -6,7 +6,6 @@ import numpy as np -from pandas.compat import range, zip from pandas.errors import PerformanceWarning import pandas as pd diff --git a/pandas/core/computation/engines.py b/pandas/core/computation/engines.py index bccd37131c81a..cb03d16b06d50 100644 --- a/pandas/core/computation/engines.py +++ b/pandas/core/computation/engines.py @@ -4,8 +4,6 @@ import abc -from pandas.compat import map - from pandas import compat from pandas.core.computation.align import _align, _reconstruct_object from pandas.core.computation.ops import ( diff --git a/pandas/core/computation/expr.py b/pandas/core/computation/expr.py index 4ab34b7349af5..1d8fea951faab 100644 --- a/pandas/core/computation/expr.py +++ b/pandas/core/computation/expr.py @@ -9,7 +9,7 @@ import numpy as np -from pandas.compat import StringIO, lmap, map, reduce, string_types, zip +from pandas.compat import StringIO, lmap, reduce, string_types import pandas as pd from pandas import compat diff --git a/pandas/core/computation/scope.py b/pandas/core/computation/scope.py index e158bc8c568eb..a2825fa9740de 100644 --- a/pandas/core/computation/scope.py +++ b/pandas/core/computation/scope.py @@ -12,7 +12,7 @@ import numpy as np from pandas._libs.tslibs import Timestamp -from pandas.compat import DeepChainMap, StringIO, map +from pandas.compat import DeepChainMap, StringIO from pandas.core.base import StringMixin import pandas.core.computation as compu diff --git a/pandas/core/frame.py b/pandas/core/frame.py index ec881c730c365..3862fa86da6ff 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -33,9 +33,9 @@ validate_axis_style_args) from pandas import compat -from pandas.compat import (range, map, zip, lmap, lzip, StringIO, u, - PY36, raise_with_traceback, Iterator, - string_and_binary_types) +from pandas.compat import ( + PY36, Iterator, StringIO, lmap, lzip, raise_with_traceback, + string_and_binary_types, u) from pandas.compat.numpy import function as nv from pandas.core.dtypes.cast import ( maybe_upcast, diff --git a/pandas/core/generic.py b/pandas/core/generic.py index f69ba51e59784..1717b00664f92 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -14,8 +14,8 @@ from pandas._libs import Timestamp, iNaT, properties import pandas.compat as compat from pandas.compat import ( - cPickle as pkl, isidentifier, lrange, lzip, map, set_function_name, - string_types, to_str, zip) + cPickle as pkl, isidentifier, lrange, lzip, set_function_name, + string_types, to_str) from pandas.compat.numpy import function as nv from pandas.errors import AbstractMethodError from pandas.util._decorators import ( diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py index 3e7abbcb6b27a..0604689c6bb2b 100644 --- a/pandas/core/groupby/generic.py +++ b/pandas/core/groupby/generic.py @@ -16,7 +16,7 @@ from pandas._libs import Timestamp, lib import pandas.compat as compat -from pandas.compat import lzip, map +from pandas.compat import lzip from pandas.compat.numpy import _np_version_under1p13 from pandas.errors import AbstractMethodError from pandas.util._decorators import Appender, Substitution diff --git a/pandas/core/groupby/groupby.py b/pandas/core/groupby/groupby.py index 96eafbfae2cdb..a57b2cb968c0f 100644 --- a/pandas/core/groupby/groupby.py +++ b/pandas/core/groupby/groupby.py @@ -19,7 +19,7 @@ class providing the base-class of operations. from pandas._libs import Timestamp, groupby as libgroupby import pandas.compat as compat -from pandas.compat import range, set_function_name, zip +from pandas.compat import set_function_name from pandas.compat.numpy import function as nv from pandas.errors import AbstractMethodError from pandas.util._decorators import Appender, Substitution, cache_readonly diff --git a/pandas/core/groupby/grouper.py b/pandas/core/groupby/grouper.py index d1ebb9cbe8ac4..e470a32b85cd6 100644 --- a/pandas/core/groupby/grouper.py +++ b/pandas/core/groupby/grouper.py @@ -8,7 +8,6 @@ import numpy as np import pandas.compat as compat -from pandas.compat import zip from pandas.util._decorators import cache_readonly from pandas.core.dtypes.common import ( diff --git a/pandas/core/groupby/ops.py b/pandas/core/groupby/ops.py index 78c9aa9187135..525af28c27ff5 100644 --- a/pandas/core/groupby/ops.py +++ b/pandas/core/groupby/ops.py @@ -11,7 +11,7 @@ import numpy as np from pandas._libs import NaT, groupby as libgroupby, iNaT, lib, reduction -from pandas.compat import lzip, range, zip +from pandas.compat import lzip from pandas.errors import AbstractMethodError from pandas.util._decorators import cache_readonly diff --git a/pandas/core/indexes/base.py b/pandas/core/indexes/base.py index a3eed90ab5d80..cf85c10bf47e0 100644 --- a/pandas/core/indexes/base.py +++ b/pandas/core/indexes/base.py @@ -12,7 +12,7 @@ from pandas._libs.tslibs import OutOfBoundsDatetime, Timedelta, Timestamp from pandas._libs.tslibs.timezones import tz_compare import pandas.compat as compat -from pandas.compat import range, set_function_name, u +from pandas.compat import set_function_name, u from pandas.compat.numpy import function as nv from pandas.util._decorators import Appender, Substitution, cache_readonly diff --git a/pandas/core/indexes/multi.py b/pandas/core/indexes/multi.py index 616c17cd16f9a..79c39c72b90a7 100644 --- a/pandas/core/indexes/multi.py +++ b/pandas/core/indexes/multi.py @@ -9,7 +9,7 @@ from pandas._libs import ( Timestamp, algos as libalgos, index as libindex, lib, tslibs) import pandas.compat as compat -from pandas.compat import lrange, lzip, map, range, zip +from pandas.compat import lrange, lzip from pandas.compat.numpy import function as nv from pandas.errors import PerformanceWarning, UnsortedIndexError from pandas.util._decorators import Appender, cache_readonly, deprecate_kwarg diff --git a/pandas/core/indexes/range.py b/pandas/core/indexes/range.py index 886a48e2acfa9..ac97e0994b4ec 100644 --- a/pandas/core/indexes/range.py +++ b/pandas/core/indexes/range.py @@ -7,7 +7,7 @@ from pandas._libs import index as libindex, lib import pandas.compat as compat -from pandas.compat import get_range_parameters, lrange, range +from pandas.compat import get_range_parameters, lrange from pandas.compat.numpy import function as nv from pandas.util._decorators import Appender, cache_readonly diff --git a/pandas/core/indexing.py b/pandas/core/indexing.py index 623a48acdd48b..ebec8b91a5aba 100755 --- a/pandas/core/indexing.py +++ b/pandas/core/indexing.py @@ -7,7 +7,6 @@ from pandas._libs.indexing import _NDFrameIndexerBase from pandas._libs.lib import item_from_zerodim import pandas.compat as compat -from pandas.compat import range, zip from pandas.errors import AbstractMethodError from pandas.util._decorators import Appender diff --git a/pandas/core/internals/blocks.py b/pandas/core/internals/blocks.py index a61bc30a126e6..979c9fb8b825b 100644 --- a/pandas/core/internals/blocks.py +++ b/pandas/core/internals/blocks.py @@ -11,7 +11,6 @@ from pandas._libs import internals as libinternals, lib, tslib, tslibs from pandas._libs.tslibs import Timedelta, conversion, is_null_datetimelike import pandas.compat as compat -from pandas.compat import range, zip from pandas.util._validators import validate_bool_kwarg from pandas.core.dtypes.cast import ( diff --git a/pandas/core/internals/construction.py b/pandas/core/internals/construction.py index 7e97512682720..d06be8b70fc96 100644 --- a/pandas/core/internals/construction.py +++ b/pandas/core/internals/construction.py @@ -11,7 +11,7 @@ from pandas._libs.tslibs import IncompatibleFrequency import pandas.compat as compat from pandas.compat import ( - get_range_parameters, lmap, lrange, raise_with_traceback, range) + get_range_parameters, lmap, lrange, raise_with_traceback) from pandas.core.dtypes.cast import ( construct_1d_arraylike_from_scalar, construct_1d_ndarray_preserving_na, diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py index b9d478f3f14eb..3ea810f44791a 100644 --- a/pandas/core/internals/managers.py +++ b/pandas/core/internals/managers.py @@ -9,7 +9,6 @@ import numpy as np from pandas._libs import internals as libinternals, lib -from pandas.compat import map, range, zip from pandas.util._validators import validate_bool_kwarg from pandas.core.dtypes.cast import ( diff --git a/pandas/core/missing.py b/pandas/core/missing.py index 9acdb1a06b2d1..6a6ab78ae3554 100644 --- a/pandas/core/missing.py +++ b/pandas/core/missing.py @@ -7,7 +7,7 @@ import numpy as np from pandas._libs import algos, lib -from pandas.compat import range, string_types +from pandas.compat import string_types from pandas.core.dtypes.cast import infer_dtype_from_array from pandas.core.dtypes.common import ( diff --git a/pandas/core/panel.py b/pandas/core/panel.py index 1555542079d80..c218e80daed9c 100644 --- a/pandas/core/panel.py +++ b/pandas/core/panel.py @@ -10,7 +10,7 @@ import numpy as np import pandas.compat as compat -from pandas.compat import map, range, u, zip +from pandas.compat import u from pandas.compat.numpy import function as nv from pandas.util._decorators import Appender, Substitution, deprecate_kwarg from pandas.util._validators import validate_axis_style_args diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py index fb50a3c60f705..cd5c853c6efe4 100644 --- a/pandas/core/reshape/merge.py +++ b/pandas/core/reshape/merge.py @@ -10,7 +10,7 @@ from pandas._libs import hashtable as libhashtable, join as libjoin, lib import pandas.compat as compat -from pandas.compat import filter, lzip, map, range, zip +from pandas.compat import lzip from pandas.errors import MergeError from pandas.util._decorators import Appender, Substitution diff --git a/pandas/core/reshape/pivot.py b/pandas/core/reshape/pivot.py index 8d7616c4b6b61..dbff2a069d73d 100644 --- a/pandas/core/reshape/pivot.py +++ b/pandas/core/reshape/pivot.py @@ -1,7 +1,7 @@ # pylint: disable=E1103 import numpy as np -from pandas.compat import lrange, range, zip +from pandas.compat import lrange from pandas.util._decorators import Appender, Substitution from pandas.core.dtypes.cast import maybe_downcast_to_dtype diff --git a/pandas/core/reshape/reshape.py b/pandas/core/reshape/reshape.py index 6ba33301753d6..68ea7932e3718 100644 --- a/pandas/core/reshape/reshape.py +++ b/pandas/core/reshape/reshape.py @@ -7,7 +7,7 @@ from pandas._libs import algos as _algos, reshape as _reshape from pandas._libs.sparse import IntIndex -from pandas.compat import PY2, range, text_type, u, zip +from pandas.compat import PY2, text_type, u from pandas.core.dtypes.cast import maybe_promote from pandas.core.dtypes.common import ( diff --git a/pandas/core/series.py b/pandas/core/series.py index d4840eae8601b..272b621f6b328 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -11,7 +11,7 @@ from pandas._libs import iNaT, index as libindex, lib, tslibs import pandas.compat as compat -from pandas.compat import PY36, StringIO, u, zip +from pandas.compat import PY36, StringIO, u from pandas.compat.numpy import function as nv from pandas.util._decorators import Appender, Substitution, deprecate from pandas.util._validators import validate_bool_kwarg diff --git a/pandas/core/strings.py b/pandas/core/strings.py index 9577b07360f65..90623737dfc0c 100644 --- a/pandas/core/strings.py +++ b/pandas/core/strings.py @@ -9,7 +9,6 @@ import pandas._libs.lib as lib import pandas._libs.ops as libops import pandas.compat as compat -from pandas.compat import zip from pandas.util._decorators import Appender, deprecate_kwarg from pandas.core.dtypes.common import ( diff --git a/pandas/core/tools/datetimes.py b/pandas/core/tools/datetimes.py index 80a7deecdffbe..0b7a0965cce2e 100644 --- a/pandas/core/tools/datetimes.py +++ b/pandas/core/tools/datetimes.py @@ -8,7 +8,6 @@ from pandas._libs.tslibs.parsing import ( # noqa DateParseError, _format_is_iso, _guess_datetime_format, parse_time_string) from pandas._libs.tslibs.strptime import array_strptime -from pandas.compat import zip from pandas.util._decorators import deprecate_kwarg from pandas.core.dtypes.common import ( diff --git a/pandas/io/date_converters.py b/pandas/io/date_converters.py index 1a22ee7240d59..75f353f28549c 100644 --- a/pandas/io/date_converters.py +++ b/pandas/io/date_converters.py @@ -2,7 +2,6 @@ import numpy as np from pandas._libs.tslibs import parsing -from pandas.compat import map, range def parse_date_time(date_col, time_col): diff --git a/pandas/io/excel/_base.py b/pandas/io/excel/_base.py index 781bb1f68d92f..4d42b336b01b8 100644 --- a/pandas/io/excel/_base.py +++ b/pandas/io/excel/_base.py @@ -6,7 +6,7 @@ import warnings import pandas.compat as compat -from pandas.compat import add_metaclass, range, string_types, u +from pandas.compat import add_metaclass, string_types, u from pandas.errors import EmptyDataError from pandas.util._decorators import Appender, deprecate_kwarg diff --git a/pandas/io/excel/_util.py b/pandas/io/excel/_util.py index 49255d83d1cd3..ebde1f954e0e8 100644 --- a/pandas/io/excel/_util.py +++ b/pandas/io/excel/_util.py @@ -1,7 +1,7 @@ import warnings import pandas.compat as compat -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.core.dtypes.common import is_integer, is_list_like diff --git a/pandas/io/excel/_xlrd.py b/pandas/io/excel/_xlrd.py index 60f7d8f94a399..03495fa7faf0c 100644 --- a/pandas/io/excel/_xlrd.py +++ b/pandas/io/excel/_xlrd.py @@ -5,7 +5,6 @@ import numpy as np import pandas.compat as compat -from pandas.compat import range, zip from pandas.io.common import _is_url, _urlopen, get_filepath_or_buffer from pandas.io.excel._base import _BaseExcelReader diff --git a/pandas/io/feather_format.py b/pandas/io/feather_format.py index b2c6dff4338b6..9d60349faaffe 100644 --- a/pandas/io/feather_format.py +++ b/pandas/io/feather_format.py @@ -2,7 +2,6 @@ from distutils.version import LooseVersion -from pandas.compat import range from pandas.util._decorators import deprecate_kwarg from pandas import DataFrame, Int64Index, RangeIndex diff --git a/pandas/io/formats/csvs.py b/pandas/io/formats/csvs.py index 46c843af043e7..71b7ef32bebc3 100644 --- a/pandas/io/formats/csvs.py +++ b/pandas/io/formats/csvs.py @@ -13,7 +13,7 @@ import numpy as np from pandas._libs import writers as libwriters -from pandas.compat import StringIO, range, zip +from pandas.compat import StringIO from pandas.core.dtypes.generic import ( ABCDatetimeIndex, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex) diff --git a/pandas/io/formats/format.py b/pandas/io/formats/format.py index 2bf0cd56daebf..016b052fdc6bb 100644 --- a/pandas/io/formats/format.py +++ b/pandas/io/formats/format.py @@ -13,7 +13,7 @@ from pandas._libs import lib from pandas._libs.tslib import format_array_from_datetime from pandas._libs.tslibs import NaT, Timedelta, Timestamp, iNaT -from pandas.compat import StringIO, lzip, map, u, zip +from pandas.compat import StringIO, lzip, u from pandas.core.dtypes.common import ( is_categorical_dtype, is_datetime64_dtype, is_datetime64tz_dtype, diff --git a/pandas/io/formats/html.py b/pandas/io/formats/html.py index a543b21f287ec..388252cdb4214 100644 --- a/pandas/io/formats/html.py +++ b/pandas/io/formats/html.py @@ -8,7 +8,7 @@ from collections import OrderedDict from textwrap import dedent -from pandas.compat import lzip, map, range, u, unichr, zip +from pandas.compat import lzip, u, unichr from pandas.core.dtypes.generic import ABCMultiIndex diff --git a/pandas/io/formats/latex.py b/pandas/io/formats/latex.py index 90be3364932a2..79835c8275929 100644 --- a/pandas/io/formats/latex.py +++ b/pandas/io/formats/latex.py @@ -6,7 +6,7 @@ import numpy as np -from pandas.compat import map, range, u, zip +from pandas.compat import u from pandas.core.dtypes.generic import ABCMultiIndex diff --git a/pandas/io/formats/style.py b/pandas/io/formats/style.py index b872f86eb8683..970d1b4b5f09a 100644 --- a/pandas/io/formats/style.py +++ b/pandas/io/formats/style.py @@ -12,7 +12,6 @@ import numpy as np -from pandas.compat import range from pandas.util._decorators import Appender from pandas.core.dtypes.common import is_float, is_string_like diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 2996e078a069d..616bbe1047f9d 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -19,8 +19,7 @@ import pandas._libs.parsers as parsers from pandas._libs.tslibs import parsing import pandas.compat as compat -from pandas.compat import ( - PY3, StringIO, lrange, lzip, map, range, string_types, u, zip) +from pandas.compat import PY3, StringIO, lrange, lzip, string_types, u from pandas.errors import ( AbstractMethodError, EmptyDataError, ParserError, ParserWarning) from pandas.util._decorators import Appender @@ -1147,7 +1146,7 @@ def read(self, nrows=None): if index is None: if col_dict: # Any column is actually fine: - new_rows = len(compat.next(compat.itervalues(col_dict))) + new_rows = len(next(compat.itervalues(col_dict))) index = RangeIndex(self._currow, self._currow + new_rows) else: new_rows = 0 diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py index 2ee8759b9bdd8..1fc51a6753adc 100644 --- a/pandas/io/pytables.py +++ b/pandas/io/pytables.py @@ -17,7 +17,7 @@ from pandas._libs import lib, writers as libwriters from pandas._libs.tslibs import timezones -from pandas.compat import PY3, filter, lrange, range, string_types +from pandas.compat import PY3, lrange, string_types from pandas.errors import PerformanceWarning from pandas.core.dtypes.common import ( @@ -351,7 +351,7 @@ def read_hdf(path_or_buf, key=None, mode='r', **kwargs): exists = False if not exists: - raise compat.FileNotFoundError( + raise FileNotFoundError( 'File {path} does not exist'.format(path=path_or_buf)) store = HDFStore(path_or_buf, mode=mode, **kwargs) diff --git a/pandas/io/s3.py b/pandas/io/s3.py index 4998e4c0400ac..bf86db279df5a 100644 --- a/pandas/io/s3.py +++ b/pandas/io/s3.py @@ -28,7 +28,7 @@ def get_filepath_or_buffer(filepath_or_buffer, encoding=None, fs = s3fs.S3FileSystem(anon=False) try: filepath_or_buffer = fs.open(_strip_schema(filepath_or_buffer), mode) - except (compat.FileNotFoundError, NoCredentialsError): + except (FileNotFoundError, NoCredentialsError): # boto3 has troubles when trying to access a public file # when credentialed... # An OSError is raised if you have credentials, but they diff --git a/pandas/io/sql.py b/pandas/io/sql.py index 02fba52eac7f7..3540daab13b54 100644 --- a/pandas/io/sql.py +++ b/pandas/io/sql.py @@ -15,8 +15,7 @@ import numpy as np import pandas._libs.lib as lib -from pandas.compat import ( - map, raise_with_traceback, string_types, text_type, zip) +from pandas.compat import raise_with_traceback, string_types, text_type from pandas.core.dtypes.common import ( is_datetime64tz_dtype, is_dict_like, is_list_like) diff --git a/pandas/io/stata.py b/pandas/io/stata.py index e5effcabbece7..9b65ceca50531 100644 --- a/pandas/io/stata.py +++ b/pandas/io/stata.py @@ -23,9 +23,7 @@ from pandas._libs.lib import infer_dtype from pandas._libs.tslibs import NaT, Timestamp from pandas._libs.writers import max_len_string_array -from pandas.compat import ( - BytesIO, ResourceWarning, lmap, lrange, lzip, range, string_types, - text_type, zip) +from pandas.compat import BytesIO, lmap, lrange, lzip, string_types, text_type from pandas.util._decorators import Appender, deprecate_kwarg from pandas.core.dtypes.common import ( diff --git a/pandas/plotting/_core.py b/pandas/plotting/_core.py index c33f7900c2cb5..5ed6c2f4e14b6 100644 --- a/pandas/plotting/_core.py +++ b/pandas/plotting/_core.py @@ -10,7 +10,7 @@ import numpy as np import pandas.compat as compat -from pandas.compat import lrange, map, range, string_types, zip +from pandas.compat import lrange, string_types from pandas.errors import AbstractMethodError from pandas.util._decorators import Appender, cache_readonly diff --git a/pandas/plotting/_misc.py b/pandas/plotting/_misc.py index b8073c89892c5..e24ceb79de0d9 100644 --- a/pandas/plotting/_misc.py +++ b/pandas/plotting/_misc.py @@ -4,7 +4,7 @@ import numpy as np -from pandas.compat import lmap, lrange, range, zip +from pandas.compat import lmap, lrange from pandas.util._decorators import deprecate_kwarg from pandas.core.dtypes.missing import notna diff --git a/pandas/plotting/_tools.py b/pandas/plotting/_tools.py index 4d9e97f11fdd3..6a1658c760c93 100644 --- a/pandas/plotting/_tools.py +++ b/pandas/plotting/_tools.py @@ -7,8 +7,6 @@ import numpy as np -from pandas.compat import range - from pandas.core.dtypes.common import is_list_like from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries diff --git a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py index 11b5bcf702e75..88758c5d5c959 100644 --- a/pandas/tests/arrays/sparse/test_array.py +++ b/pandas/tests/arrays/sparse/test_array.py @@ -6,7 +6,6 @@ import pytest from pandas._libs.sparse import IntIndex -from pandas.compat import range import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/frame/test_api.py b/pandas/tests/frame/test_api.py index 5a5335281d41d..f31c6e42fda45 100644 --- a/pandas/tests/frame/test_api.py +++ b/pandas/tests/frame/test_api.py @@ -9,7 +9,7 @@ import numpy as np import pytest -from pandas.compat import long, lrange, range +from pandas.compat import long, lrange import pandas as pd from pandas import ( diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index f14ecae448723..6503dba458399 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -6,8 +6,6 @@ import numpy as np import pytest -from pandas.compat import range - import pandas as pd from pandas.tests.frame.common import _check_mixed_float, _check_mixed_int import pandas.util.testing as tm diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py index ab064ed98e31f..1802e05717a13 100644 --- a/pandas/tests/frame/test_constructors.py +++ b/pandas/tests/frame/test_constructors.py @@ -12,7 +12,7 @@ import pytest from pandas.compat import ( - PY36, is_platform_little_endian, lmap, long, lrange, lzip, range, zip) + PY36, is_platform_little_endian, lmap, long, lrange, lzip) from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike from pandas.core.dtypes.common import is_integer_dtype diff --git a/pandas/tests/frame/test_indexing.py b/pandas/tests/frame/test_indexing.py index 07b6a28b90619..81a6c6652f2ce 100644 --- a/pandas/tests/frame/test_indexing.py +++ b/pandas/tests/frame/test_indexing.py @@ -9,7 +9,7 @@ import pytest from pandas._libs.tslib import iNaT -from pandas.compat import long, lrange, lzip, map, range, zip +from pandas.compat import long, lrange, lzip from pandas.core.dtypes.common import is_float_dtype, is_integer, is_scalar from pandas.core.dtypes.dtypes import CategoricalDtype diff --git a/pandas/tests/frame/test_mutate_columns.py b/pandas/tests/frame/test_mutate_columns.py index 211173371ac7e..5f91363bad8dc 100644 --- a/pandas/tests/frame/test_mutate_columns.py +++ b/pandas/tests/frame/test_mutate_columns.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from pandas.compat import PY36, lrange, range +from pandas.compat import PY36, lrange from pandas import DataFrame, Index, MultiIndex, Series import pandas.util.testing as tm diff --git a/pandas/tests/frame/test_operators.py b/pandas/tests/frame/test_operators.py index 4f671b9dc398a..5d3ac43d3db36 100644 --- a/pandas/tests/frame/test_operators.py +++ b/pandas/tests/frame/test_operators.py @@ -8,8 +8,6 @@ import numpy as np import pytest -from pandas.compat import range - import pandas as pd from pandas import DataFrame, MultiIndex, Series, compat import pandas.core.common as com diff --git a/pandas/tests/frame/test_query_eval.py b/pandas/tests/frame/test_query_eval.py index a8a9a278a0ebb..a994e0919ef40 100644 --- a/pandas/tests/frame/test_query_eval.py +++ b/pandas/tests/frame/test_query_eval.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, lrange, range, zip +from pandas.compat import StringIO, lrange import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/frame/test_replace.py b/pandas/tests/frame/test_replace.py index 50c66d3f8db00..69fb829af944a 100644 --- a/pandas/tests/frame/test_replace.py +++ b/pandas/tests/frame/test_replace.py @@ -8,7 +8,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, lrange, range, zip +from pandas.compat import StringIO, lrange import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, compat, date_range diff --git a/pandas/tests/frame/test_to_csv.py b/pandas/tests/frame/test_to_csv.py index 59bf3d00f979c..719294db053e5 100644 --- a/pandas/tests/frame/test_to_csv.py +++ b/pandas/tests/frame/test_to_csv.py @@ -8,7 +8,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, lmap, lrange, range, u +from pandas.compat import StringIO, lmap, lrange, u from pandas.errors import ParserError import pandas as pd diff --git a/pandas/tests/generic/test_frame.py b/pandas/tests/generic/test_frame.py index 25440702a339b..9ae7252104746 100644 --- a/pandas/tests/generic/test_frame.py +++ b/pandas/tests/generic/test_frame.py @@ -8,7 +8,6 @@ import numpy as np import pytest -from pandas.compat import range import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/generic/test_generic.py b/pandas/tests/generic/test_generic.py index 65608d95ba770..d3b63e428b374 100644 --- a/pandas/tests/generic/test_generic.py +++ b/pandas/tests/generic/test_generic.py @@ -6,8 +6,6 @@ import numpy as np import pytest -from pandas.compat import range, zip - from pandas.core.dtypes.common import is_scalar import pandas as pd diff --git a/pandas/tests/generic/test_series.py b/pandas/tests/generic/test_series.py index b7d42e45253b0..dd311dc214d30 100644 --- a/pandas/tests/generic/test_series.py +++ b/pandas/tests/generic/test_series.py @@ -7,7 +7,6 @@ import numpy as np import pytest -from pandas.compat import range import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/groupby/test_counting.py b/pandas/tests/groupby/test_counting.py index 1438de5b7e37c..9055b8ae71b4f 100644 --- a/pandas/tests/groupby/test_counting.py +++ b/pandas/tests/groupby/test_counting.py @@ -4,7 +4,7 @@ import numpy as np import pytest -from pandas.compat import product as cart_product, range +from pandas.compat import product as cart_product from pandas import DataFrame, MultiIndex, Period, Series, Timedelta, Timestamp from pandas.util.testing import assert_frame_equal, assert_series_equal diff --git a/pandas/tests/groupby/test_groupby.py b/pandas/tests/groupby/test_groupby.py index f80a7300334e4..a2bcecb6bcdd2 100644 --- a/pandas/tests/groupby/test_groupby.py +++ b/pandas/tests/groupby/test_groupby.py @@ -8,7 +8,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, lmap, lrange, lzip, map, range, zip +from pandas.compat import StringIO, lmap, lrange, lzip from pandas.errors import PerformanceWarning import pandas as pd diff --git a/pandas/tests/indexes/datetimes/test_timezones.py b/pandas/tests/indexes/datetimes/test_timezones.py index 3dd836cf5b2d8..760c4cd01c5b2 100644 --- a/pandas/tests/indexes/datetimes/test_timezones.py +++ b/pandas/tests/indexes/datetimes/test_timezones.py @@ -12,7 +12,7 @@ import pytz from pandas._libs.tslibs import conversion, timezones -from pandas.compat import lrange, zip +from pandas.compat import lrange import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/indexes/multi/test_constructor.py b/pandas/tests/indexes/multi/test_constructor.py index fe90e85cf93c8..dfbf46b85bb57 100644 --- a/pandas/tests/indexes/multi/test_constructor.py +++ b/pandas/tests/indexes/multi/test_constructor.py @@ -6,7 +6,7 @@ import pytest from pandas._libs.tslib import Timestamp -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike diff --git a/pandas/tests/indexes/multi/test_conversion.py b/pandas/tests/indexes/multi/test_conversion.py index 00b935521bac4..e1aedf77c4d29 100644 --- a/pandas/tests/indexes/multi/test_conversion.py +++ b/pandas/tests/indexes/multi/test_conversion.py @@ -5,8 +5,6 @@ import numpy as np import pytest -from pandas.compat import range - import pandas as pd from pandas import DataFrame, MultiIndex, date_range import pandas.util.testing as tm diff --git a/pandas/tests/indexes/multi/test_duplicates.py b/pandas/tests/indexes/multi/test_duplicates.py index 35034dc57b4b8..3ba41190a297a 100644 --- a/pandas/tests/indexes/multi/test_duplicates.py +++ b/pandas/tests/indexes/multi/test_duplicates.py @@ -6,7 +6,7 @@ import pytest from pandas._libs import hashtable -from pandas.compat import range, u +from pandas.compat import u from pandas import DatetimeIndex, MultiIndex import pandas.util.testing as tm diff --git a/pandas/tests/indexes/multi/test_equivalence.py b/pandas/tests/indexes/multi/test_equivalence.py index 6a9eb662dd9d4..58ceefc175bb9 100644 --- a/pandas/tests/indexes/multi/test_equivalence.py +++ b/pandas/tests/indexes/multi/test_equivalence.py @@ -3,7 +3,7 @@ import numpy as np import pytest -from pandas.compat import lrange, lzip, range +from pandas.compat import lrange, lzip import pandas as pd from pandas import Index, MultiIndex, Series diff --git a/pandas/tests/indexes/multi/test_format.py b/pandas/tests/indexes/multi/test_format.py index 273822de19eb6..bb431a1a67b32 100644 --- a/pandas/tests/indexes/multi/test_format.py +++ b/pandas/tests/indexes/multi/test_format.py @@ -5,7 +5,7 @@ import pytest -from pandas.compat import range, u +from pandas.compat import u import pandas as pd from pandas import MultiIndex, compat diff --git a/pandas/tests/indexes/multi/test_get_set.py b/pandas/tests/indexes/multi/test_get_set.py index 62911c7032aca..de4f4320fe83f 100644 --- a/pandas/tests/indexes/multi/test_get_set.py +++ b/pandas/tests/indexes/multi/test_get_set.py @@ -4,8 +4,6 @@ import numpy as np import pytest -from pandas.compat import range - import pandas as pd from pandas import CategoricalIndex, Index, MultiIndex import pandas.util.testing as tm diff --git a/pandas/tests/indexes/multi/test_integrity.py b/pandas/tests/indexes/multi/test_integrity.py index a7dc093147725..6eccc92004d93 100644 --- a/pandas/tests/indexes/multi/test_integrity.py +++ b/pandas/tests/indexes/multi/test_integrity.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py index 490a41f023f8e..8a92d9b42fa6e 100644 --- a/pandas/tests/indexes/test_base.py +++ b/pandas/tests/indexes/test_base.py @@ -11,7 +11,7 @@ import pytest from pandas._libs.tslib import Timestamp -from pandas.compat import PY36, StringIO, lrange, lzip, range, u, zip +from pandas.compat import PY36, StringIO, lrange, lzip, u from pandas.compat.numpy import np_datetime64_compat from pandas.core.dtypes.common import is_unsigned_integer_dtype diff --git a/pandas/tests/indexes/test_category.py b/pandas/tests/indexes/test_category.py index 42c4df297813a..871a9c1977d4c 100644 --- a/pandas/tests/indexes/test_category.py +++ b/pandas/tests/indexes/test_category.py @@ -4,7 +4,6 @@ import pytest from pandas._libs import index as libindex -from pandas.compat import range from pandas.core.dtypes.dtypes import CategoricalDtype diff --git a/pandas/tests/indexes/test_numeric.py b/pandas/tests/indexes/test_numeric.py index 0a8c54f8136a7..1011539b1bde2 100644 --- a/pandas/tests/indexes/test_numeric.py +++ b/pandas/tests/indexes/test_numeric.py @@ -7,7 +7,6 @@ import pytest from pandas._libs.tslibs import Timestamp -from pandas.compat import range import pandas as pd from pandas import Float64Index, Index, Int64Index, Series, UInt64Index diff --git a/pandas/tests/indexes/test_range.py b/pandas/tests/indexes/test_range.py index 717a63d8c8d49..158327b0769fc 100644 --- a/pandas/tests/indexes/test_range.py +++ b/pandas/tests/indexes/test_range.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from pandas.compat import range, u +from pandas.compat import u import pandas as pd from pandas import Float64Index, Index, Int64Index, RangeIndex, Series diff --git a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py index 0ff499155f0c4..3f3a9d49704bc 100644 --- a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py +++ b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py @@ -1,7 +1,7 @@ import numpy as np import pytest -from pandas.compat import lrange, lzip, range +from pandas.compat import lrange, lzip from pandas import DataFrame, MultiIndex, Series from pandas.core import common as com diff --git a/pandas/tests/indexing/multiindex/test_getitem.py b/pandas/tests/indexing/multiindex/test_getitem.py index b7fdbee0b7185..490a9bf08ca3e 100644 --- a/pandas/tests/indexing/multiindex/test_getitem.py +++ b/pandas/tests/indexing/multiindex/test_getitem.py @@ -1,7 +1,7 @@ import numpy as np import pytest -from pandas.compat import u, zip +from pandas.compat import u from pandas import DataFrame, Index, MultiIndex, Series from pandas.core.indexing import IndexingError diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index e6ee35572c252..3cdae198cad31 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -10,7 +10,7 @@ import numpy as np import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype diff --git a/pandas/tests/indexing/test_indexing_engines.py b/pandas/tests/indexing/test_indexing_engines.py index 57b85fd46a44e..5d01196f796de 100644 --- a/pandas/tests/indexing/test_indexing_engines.py +++ b/pandas/tests/indexing/test_indexing_engines.py @@ -2,7 +2,6 @@ from pandas._libs import algos as libalgos, index as libindex -from pandas import compat import pandas.util.testing as tm @@ -69,7 +68,7 @@ def test_get_backfill_indexer( arr = np.array([1, 5, 10], dtype=dtype) engine = engine_type(lambda: arr, len(arr)) - new = np.array(compat.range(12), dtype=dtype) + new = np.arange(12, dtype=dtype) result = engine.get_backfill_indexer(new) expected = libalgos.backfill(arr, new) @@ -82,7 +81,7 @@ def test_get_pad_indexer( arr = np.array([1, 5, 10], dtype=dtype) engine = engine_type(lambda: arr, len(arr)) - new = np.array(compat.range(12), dtype=dtype) + new = np.arange(12, dtype=dtype) result = engine.get_pad_indexer(new) expected = libalgos.pad(arr, new) diff --git a/pandas/tests/internals/test_internals.py b/pandas/tests/internals/test_internals.py index 4129184373a2a..058afdc4c2c83 100644 --- a/pandas/tests/internals/test_internals.py +++ b/pandas/tests/internals/test_internals.py @@ -12,7 +12,7 @@ import pytest from pandas._libs.internals import BlockPlacement -from pandas.compat import lrange, u, zip +from pandas.compat import lrange, u import pandas as pd from pandas import ( diff --git a/pandas/tests/io/formats/test_format.py b/pandas/tests/io/formats/test_format.py index e42ba834cb083..c39cc2443a18a 100644 --- a/pandas/tests/io/formats/test_format.py +++ b/pandas/tests/io/formats/test_format.py @@ -22,8 +22,7 @@ import pandas.compat as compat from pandas.compat import ( - StringIO, is_platform_32bit, is_platform_windows, lrange, lzip, range, u, - zip) + StringIO, is_platform_32bit, is_platform_windows, lrange, lzip, u) import pandas as pd from pandas import ( diff --git a/pandas/tests/io/generate_legacy_storage_files.py b/pandas/tests/io/generate_legacy_storage_files.py index 6c6e28cb1c090..815b8d4deaa66 100755 --- a/pandas/tests/io/generate_legacy_storage_files.py +++ b/pandas/tests/io/generate_legacy_storage_files.py @@ -290,7 +290,7 @@ def write_legacy_pickles(output_dir): # make sure we are < 0.13 compat (in py3) try: - from pandas.compat import zip, cPickle as pickle # noqa + from pandas.compat import cPickle as pickle # noqa except ImportError: import pickle diff --git a/pandas/tests/io/json/test_pandas.py b/pandas/tests/io/json/test_pandas.py index c1861ae152cd9..a804c1a79a876 100644 --- a/pandas/tests/io/json/test_pandas.py +++ b/pandas/tests/io/json/test_pandas.py @@ -8,7 +8,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, is_platform_32bit, lrange, range +from pandas.compat import StringIO, is_platform_32bit, lrange import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 5595a959c9a29..928295f8c4be9 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -20,7 +20,7 @@ import pandas._libs.json as ujson from pandas._libs.tslib import Timestamp import pandas.compat as compat -from pandas.compat import StringIO, range, u +from pandas.compat import StringIO, u from pandas import DataFrame, DatetimeIndex, Index, NaT, Series, date_range import pandas.util.testing as tm diff --git a/pandas/tests/io/parser/test_c_parser_only.py b/pandas/tests/io/parser/test_c_parser_only.py index 5d1d1ad596ec9..0e10c3f3f860e 100644 --- a/pandas/tests/io/parser/test_c_parser_only.py +++ b/pandas/tests/io/parser/test_c_parser_only.py @@ -15,7 +15,7 @@ import numpy as np import pytest -from pandas.compat import BytesIO, StringIO, lrange, range +from pandas.compat import BytesIO, StringIO, lrange from pandas.errors import ParserError import pandas.util._test_decorators as td diff --git a/pandas/tests/io/parser/test_common.py b/pandas/tests/io/parser/test_common.py index 671659c5e4ed0..30923bb7f5004 100644 --- a/pandas/tests/io/parser/test_common.py +++ b/pandas/tests/io/parser/test_common.py @@ -17,7 +17,7 @@ import pytest from pandas._libs.tslib import Timestamp -from pandas.compat import BytesIO, StringIO, lrange, range, u +from pandas.compat import BytesIO, StringIO, lrange, u from pandas.errors import DtypeWarning, EmptyDataError, ParserError from pandas import DataFrame, Index, MultiIndex, Series, compat, concat @@ -892,7 +892,7 @@ def test_nonexistent_path(all_parsers): msg = ("does not exist" if parser.engine == "c" else r"\[Errno 2\]") - with pytest.raises(compat.FileNotFoundError, match=msg) as e: + with pytest.raises(FileNotFoundError, match=msg) as e: parser.read_csv(path) filename = e.value.filename diff --git a/pandas/tests/io/parser/test_multi_thread.py b/pandas/tests/io/parser/test_multi_thread.py index fbf23f769e202..e8976e12f1cd3 100644 --- a/pandas/tests/io/parser/test_multi_thread.py +++ b/pandas/tests/io/parser/test_multi_thread.py @@ -11,7 +11,7 @@ import numpy as np -from pandas.compat import BytesIO, range +from pandas.compat import BytesIO import pandas as pd from pandas import DataFrame diff --git a/pandas/tests/io/parser/test_na_values.py b/pandas/tests/io/parser/test_na_values.py index 1b6d2ee8a062e..e6f44eccb0762 100644 --- a/pandas/tests/io/parser/test_na_values.py +++ b/pandas/tests/io/parser/test_na_values.py @@ -8,7 +8,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, range +from pandas.compat import StringIO from pandas import DataFrame, Index, MultiIndex import pandas.util.testing as tm diff --git a/pandas/tests/io/parser/test_skiprows.py b/pandas/tests/io/parser/test_skiprows.py index 1df2ca4fad4d8..c469813f1b71e 100644 --- a/pandas/tests/io/parser/test_skiprows.py +++ b/pandas/tests/io/parser/test_skiprows.py @@ -10,7 +10,7 @@ import numpy as np import pytest -from pandas.compat import StringIO, lrange, range +from pandas.compat import StringIO, lrange from pandas.errors import EmptyDataError from pandas import DataFrame, Index diff --git a/pandas/tests/io/parser/test_textreader.py b/pandas/tests/io/parser/test_textreader.py index 8119de67890a5..9195b577a4c8f 100644 --- a/pandas/tests/io/parser/test_textreader.py +++ b/pandas/tests/io/parser/test_textreader.py @@ -14,7 +14,7 @@ import pandas._libs.parsers as parser from pandas._libs.parsers import TextReader import pandas.compat as compat -from pandas.compat import BytesIO, StringIO, map +from pandas.compat import BytesIO, StringIO from pandas import DataFrame import pandas.util.testing as tm diff --git a/pandas/tests/io/test_common.py b/pandas/tests/io/test_common.py index 4051adc7ee4cb..f89586068ff93 100644 --- a/pandas/tests/io/test_common.py +++ b/pandas/tests/io/test_common.py @@ -6,7 +6,7 @@ import pytest -from pandas.compat import FileNotFoundError, StringIO, is_platform_windows +from pandas.compat import StringIO, is_platform_windows import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/io/test_excel.py b/pandas/tests/io/test_excel.py index 04c9c58a326a4..d508049ed5c4c 100644 --- a/pandas/tests/io/test_excel.py +++ b/pandas/tests/io/test_excel.py @@ -10,7 +10,7 @@ from numpy import nan import pytest -from pandas.compat import PY36, BytesIO, iteritems, map, range, u +from pandas.compat import PY36, BytesIO, iteritems, u import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/io/test_gbq.py b/pandas/tests/io/test_gbq.py index 8150a058e5c5a..605108f875cb9 100644 --- a/pandas/tests/io/test_gbq.py +++ b/pandas/tests/io/test_gbq.py @@ -6,8 +6,6 @@ import pytest import pytz -from pandas.compat import range - import pandas as pd from pandas import DataFrame import pandas.util.testing as tm diff --git a/pandas/tests/io/test_html.py b/pandas/tests/io/test_html.py index 591eea7203094..3bdb7d2d4dc61 100644 --- a/pandas/tests/io/test_html.py +++ b/pandas/tests/io/test_html.py @@ -9,8 +9,7 @@ from numpy.random import rand import pytest -from pandas.compat import ( - BytesIO, StringIO, is_platform_windows, map, reload, zip) +from pandas.compat import BytesIO, StringIO, is_platform_windows, reload from pandas.errors import ParserError import pandas.util._test_decorators as td diff --git a/pandas/tests/io/test_pytables.py b/pandas/tests/io/test_pytables.py index 41d247798bd42..2483763c2e66f 100644 --- a/pandas/tests/io/test_pytables.py +++ b/pandas/tests/io/test_pytables.py @@ -11,7 +11,7 @@ from pandas.compat import ( PY35, PY36, BytesIO, is_platform_little_endian, is_platform_windows, - lrange, range, text_type, u) + lrange, text_type, u) import pandas.util._test_decorators as td from pandas.core.dtypes.common import is_categorical_dtype @@ -19,8 +19,8 @@ import pandas as pd from pandas import ( Categorical, DataFrame, DatetimeIndex, Index, Int64Index, MultiIndex, - RangeIndex, Series, Timestamp, bdate_range, compat, concat, date_range, - isna, timedelta_range) + RangeIndex, Series, Timestamp, bdate_range, concat, date_range, isna, + timedelta_range) import pandas.util.testing as tm from pandas.util.testing import ( assert_frame_equal, assert_series_equal, set_timezone) @@ -301,8 +301,7 @@ def test_api(self): # File path doesn't exist path = "" - pytest.raises(compat.FileNotFoundError, - read_hdf, path, 'df') + pytest.raises(FileNotFoundError, read_hdf, path, 'df') def test_api_default_format(self): diff --git a/pandas/tests/io/test_sql.py b/pandas/tests/io/test_sql.py index daf622af889a3..0adef349ec2d7 100644 --- a/pandas/tests/io/test_sql.py +++ b/pandas/tests/io/test_sql.py @@ -28,7 +28,7 @@ import pytest import pandas.compat as compat -from pandas.compat import PY36, lrange, range, string_types +from pandas.compat import PY36, lrange, string_types from pandas.core.dtypes.common import ( is_datetime64_dtype, is_datetime64tz_dtype) diff --git a/pandas/tests/io/test_stata.py b/pandas/tests/io/test_stata.py index 118ad716c3669..3f23f34b3f860 100644 --- a/pandas/tests/io/test_stata.py +++ b/pandas/tests/io/test_stata.py @@ -14,7 +14,7 @@ import pytest import pandas.compat as compat -from pandas.compat import ResourceWarning, iterkeys +from pandas.compat import iterkeys from pandas.core.dtypes.common import is_categorical_dtype diff --git a/pandas/tests/plotting/common.py b/pandas/tests/plotting/common.py index 4ca916a0aa4e4..9067a724289fe 100644 --- a/pandas/tests/plotting/common.py +++ b/pandas/tests/plotting/common.py @@ -8,7 +8,7 @@ from numpy import random import pytest -from pandas.compat import iteritems, zip +from pandas.compat import iteritems from pandas.util._decorators import cache_readonly import pandas.util._test_decorators as td diff --git a/pandas/tests/plotting/test_boxplot_method.py b/pandas/tests/plotting/test_boxplot_method.py index e6b9795aebe7c..84d6e92b59ff2 100644 --- a/pandas/tests/plotting/test_boxplot_method.py +++ b/pandas/tests/plotting/test_boxplot_method.py @@ -7,7 +7,7 @@ from numpy import random import pytest -from pandas.compat import lzip, range +from pandas.compat import lzip import pandas.util._test_decorators as td from pandas import DataFrame, MultiIndex, Series diff --git a/pandas/tests/plotting/test_datetimelike.py b/pandas/tests/plotting/test_datetimelike.py index 3a3618e2516b2..b8bcf83d8631b 100644 --- a/pandas/tests/plotting/test_datetimelike.py +++ b/pandas/tests/plotting/test_datetimelike.py @@ -6,7 +6,7 @@ import numpy as np import pytest -from pandas.compat import lrange, zip +from pandas.compat import lrange import pandas.util._test_decorators as td from pandas import DataFrame, Index, NaT, Series, isna diff --git a/pandas/tests/plotting/test_frame.py b/pandas/tests/plotting/test_frame.py index f6ec3f99a7b61..2b17377c7b9bc 100644 --- a/pandas/tests/plotting/test_frame.py +++ b/pandas/tests/plotting/test_frame.py @@ -10,7 +10,7 @@ from numpy.random import rand, randn import pytest -from pandas.compat import lmap, lrange, lzip, range, u, zip +from pandas.compat import lmap, lrange, lzip, u import pandas.util._test_decorators as td from pandas.core.dtypes.api import is_list_like diff --git a/pandas/tests/plotting/test_series.py b/pandas/tests/plotting/test_series.py index aa78f38b75a10..e384c578aa446 100644 --- a/pandas/tests/plotting/test_series.py +++ b/pandas/tests/plotting/test_series.py @@ -10,7 +10,7 @@ from numpy.random import randn import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/resample/test_base.py b/pandas/tests/resample/test_base.py index 8f912ea5c524a..c3c908f4b0d1b 100644 --- a/pandas/tests/resample/test_base.py +++ b/pandas/tests/resample/test_base.py @@ -3,8 +3,6 @@ import numpy as np import pytest -from pandas.compat import range, zip - import pandas as pd from pandas import DataFrame, Series from pandas.core.groupby.groupby import DataError diff --git a/pandas/tests/resample/test_datetime_index.py b/pandas/tests/resample/test_datetime_index.py index ec05595536de4..0c6ef9ebc75fe 100644 --- a/pandas/tests/resample/test_datetime_index.py +++ b/pandas/tests/resample/test_datetime_index.py @@ -5,7 +5,7 @@ import pytest import pytz -from pandas.compat import StringIO, range +from pandas.compat import StringIO from pandas.errors import UnsupportedFunctionCall import pandas as pd diff --git a/pandas/tests/resample/test_period_index.py b/pandas/tests/resample/test_period_index.py index 8abdf9034527b..2bc85cc4ecd3b 100644 --- a/pandas/tests/resample/test_period_index.py +++ b/pandas/tests/resample/test_period_index.py @@ -7,7 +7,7 @@ from pandas._libs.tslibs.ccalendar import DAYS, MONTHS from pandas._libs.tslibs.period import IncompatibleFrequency -from pandas.compat import lrange, range, zip +from pandas.compat import lrange import pandas as pd from pandas import DataFrame, Series, Timestamp diff --git a/pandas/tests/resample/test_resample_api.py b/pandas/tests/resample/test_resample_api.py index 97f1e07380ef9..ff4088f5c4376 100644 --- a/pandas/tests/resample/test_resample_api.py +++ b/pandas/tests/resample/test_resample_api.py @@ -6,8 +6,6 @@ import numpy as np import pytest -from pandas.compat import range - import pandas as pd from pandas import DataFrame, Series from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/resample/test_resampler_grouper.py b/pandas/tests/resample/test_resampler_grouper.py index b61acfc3d2c5e..6aa844dc119c1 100644 --- a/pandas/tests/resample/test_resampler_grouper.py +++ b/pandas/tests/resample/test_resampler_grouper.py @@ -4,8 +4,6 @@ import numpy as np -from pandas.compat import range - import pandas as pd from pandas import DataFrame, Series, Timestamp from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/reshape/test_melt.py b/pandas/tests/reshape/test_melt.py index 6bd1958633e25..203e565818f34 100644 --- a/pandas/tests/reshape/test_melt.py +++ b/pandas/tests/reshape/test_melt.py @@ -5,8 +5,6 @@ from numpy import nan import pytest -from pandas.compat import range - import pandas as pd from pandas import DataFrame, lreshape, melt, wide_to_long import pandas.util.testing as tm diff --git a/pandas/tests/reshape/test_pivot.py b/pandas/tests/reshape/test_pivot.py index e4fbb204af533..dd5e53927fcd1 100644 --- a/pandas/tests/reshape/test_pivot.py +++ b/pandas/tests/reshape/test_pivot.py @@ -6,7 +6,7 @@ import numpy as np import pytest -from pandas.compat import product, range +from pandas.compat import product import pandas as pd from pandas import ( diff --git a/pandas/tests/reshape/test_qcut.py b/pandas/tests/reshape/test_qcut.py index 997df7fd7aa4c..e66484822c625 100644 --- a/pandas/tests/reshape/test_qcut.py +++ b/pandas/tests/reshape/test_qcut.py @@ -3,8 +3,6 @@ import numpy as np import pytest -from pandas.compat import zip - from pandas import ( Categorical, DatetimeIndex, Interval, IntervalIndex, NaT, Series, TimedeltaIndex, Timestamp, cut, date_range, isna, qcut, timedelta_range) diff --git a/pandas/tests/series/indexing/test_alter_index.py b/pandas/tests/series/indexing/test_alter_index.py index a826a0644fa78..edc21282ccafa 100644 --- a/pandas/tests/series/indexing/test_alter_index.py +++ b/pandas/tests/series/indexing/test_alter_index.py @@ -8,7 +8,7 @@ import pytest import pandas.compat as compat -from pandas.compat import lrange, range +from pandas.compat import lrange import pandas as pd from pandas import Categorical, Series, date_range, isna diff --git a/pandas/tests/series/indexing/test_boolean.py b/pandas/tests/series/indexing/test_boolean.py index 9017d13051b88..a94b0c863b536 100644 --- a/pandas/tests/series/indexing/test_boolean.py +++ b/pandas/tests/series/indexing/test_boolean.py @@ -4,7 +4,7 @@ import numpy as np import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.core.dtypes.common import is_integer diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 8e4c7d9b17efc..2d2eb6db7c51d 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -8,7 +8,7 @@ from pandas._libs import iNaT import pandas._libs.index as _index -from pandas.compat import lrange, range +from pandas.compat import lrange import pandas as pd from pandas import DataFrame, DatetimeIndex, NaT, Series, Timestamp, date_range diff --git a/pandas/tests/series/indexing/test_iloc.py b/pandas/tests/series/indexing/test_iloc.py index fa85da6a70d62..95c940b7518f4 100644 --- a/pandas/tests/series/indexing/test_iloc.py +++ b/pandas/tests/series/indexing/test_iloc.py @@ -3,7 +3,7 @@ import numpy as np -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas import Series from pandas.util.testing import assert_almost_equal, assert_series_equal diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py index dbe667a166d0a..98a83400ea7ab 100644 --- a/pandas/tests/series/indexing/test_indexing.py +++ b/pandas/tests/series/indexing/test_indexing.py @@ -8,7 +8,7 @@ import numpy as np import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.core.dtypes.common import is_scalar diff --git a/pandas/tests/series/indexing/test_numeric.py b/pandas/tests/series/indexing/test_numeric.py index e4afb0e456706..2f1e89b1146ae 100644 --- a/pandas/tests/series/indexing/test_numeric.py +++ b/pandas/tests/series/indexing/test_numeric.py @@ -4,7 +4,7 @@ import numpy as np import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange import pandas as pd from pandas import DataFrame, Index, Series diff --git a/pandas/tests/series/test_alter_axes.py b/pandas/tests/series/test_alter_axes.py index 73adc7d4bf82f..bdd551c98f897 100644 --- a/pandas/tests/series/test_alter_axes.py +++ b/pandas/tests/series/test_alter_axes.py @@ -6,7 +6,7 @@ import numpy as np import pytest -from pandas.compat import lrange, range, zip +from pandas.compat import lrange from pandas import DataFrame, Index, MultiIndex, RangeIndex, Series import pandas.util.testing as tm diff --git a/pandas/tests/series/test_analytics.py b/pandas/tests/series/test_analytics.py index 04256c084a7b4..919f942bfa437 100644 --- a/pandas/tests/series/test_analytics.py +++ b/pandas/tests/series/test_analytics.py @@ -9,7 +9,7 @@ from numpy import nan import pytest -from pandas.compat import lrange, range +from pandas.compat import lrange import pandas.util._test_decorators as td import pandas as pd diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index 3ad9d54175f31..b8f6482e9d674 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -8,7 +8,7 @@ import pytest import pandas.compat as compat -from pandas.compat import isidentifier, lzip, range, string_types +from pandas.compat import isidentifier, lzip, string_types import pandas as pd from pandas import ( diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index 96e18c6a60cac..54d9359e5aa78 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -11,7 +11,7 @@ from pandas._libs import lib from pandas._libs.tslib import iNaT -from pandas.compat import PY36, long, lrange, range, zip +from pandas.compat import PY36, long, lrange from pandas.core.dtypes.common import ( is_categorical_dtype, is_datetime64tz_dtype) diff --git a/pandas/tests/series/test_dtypes.py b/pandas/tests/series/test_dtypes.py index 718fe8ad2f40b..cb457b7c1a200 100644 --- a/pandas/tests/series/test_dtypes.py +++ b/pandas/tests/series/test_dtypes.py @@ -10,7 +10,7 @@ from pandas._libs.tslibs import iNaT import pandas.compat as compat -from pandas.compat import lrange, range, u +from pandas.compat import lrange, u import pandas as pd from pandas import ( diff --git a/pandas/tests/series/test_missing.py b/pandas/tests/series/test_missing.py index 6b8acdc6e3f5c..2163914f915b2 100644 --- a/pandas/tests/series/test_missing.py +++ b/pandas/tests/series/test_missing.py @@ -10,7 +10,6 @@ import pytz from pandas._libs.tslib import iNaT -from pandas.compat import range from pandas.errors import PerformanceWarning import pandas.util._test_decorators as td diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index b7618d2479a47..cb8d5239aa684 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -7,8 +7,6 @@ import numpy as np import pytest -from pandas.compat import range - import pandas as pd from pandas import ( Categorical, DataFrame, Index, Series, bdate_range, date_range, isna) diff --git a/pandas/tests/series/test_repr.py b/pandas/tests/series/test_repr.py index b8a204011736f..108785e2bce27 100644 --- a/pandas/tests/series/test_repr.py +++ b/pandas/tests/series/test_repr.py @@ -5,7 +5,7 @@ import numpy as np -from pandas.compat import lrange, range, u +from pandas.compat import lrange, u import pandas as pd from pandas import ( diff --git a/pandas/tests/sparse/series/test_series.py b/pandas/tests/sparse/series/test_series.py index 93cf629f20957..703ae3bde71d1 100644 --- a/pandas/tests/sparse/series/test_series.py +++ b/pandas/tests/sparse/series/test_series.py @@ -8,7 +8,7 @@ import pytest from pandas._libs.sparse import BlockIndex, IntIndex -from pandas.compat import PY36, range +from pandas.compat import PY36 from pandas.errors import PerformanceWarning import pandas.util._test_decorators as td diff --git a/pandas/tests/test_algos.py b/pandas/tests/test_algos.py index 232771750838e..b8226bc2f8269 100644 --- a/pandas/tests/test_algos.py +++ b/pandas/tests/test_algos.py @@ -11,7 +11,7 @@ from pandas._libs import ( algos as libalgos, groupby as libgroupby, hashtable as ht) -from pandas.compat import lrange, range +from pandas.compat import lrange from pandas.compat.numpy import np_array_datetime64_compat import pandas.util._test_decorators as td diff --git a/pandas/tests/test_compat.py b/pandas/tests/test_compat.py index 3cf7ec3800936..d5f112e3cb847 100644 --- a/pandas/tests/test_compat.py +++ b/pandas/tests/test_compat.py @@ -8,66 +8,51 @@ import pytest from pandas.compat import ( - builtins, filter, get_range_parameters, iteritems, iterkeys, itervalues, - lfilter, lmap, lrange, lzip, map, next, range, re_type, zip) + builtins, get_range_parameters, iteritems, iterkeys, itervalues, lfilter, + lmap, lrange, lzip, re_type) class TestBuiltinIterators(object): @classmethod - def check_result(cls, actual, expected, lengths): - for (iter_res, list_res), exp, length in zip(actual, expected, - lengths): - assert not isinstance(iter_res, list) - assert isinstance(list_res, list) - - iter_res = list(iter_res) - - assert len(list_res) == length - assert len(iter_res) == length - assert iter_res == exp - assert list_res == exp - - def test_range(self): - actual1 = range(10) - actual2 = lrange(10) - actual = [actual1, actual2], - expected = list(builtins.range(10)), + def check_results(cls, results, expecteds, lengths): + for result, expected, length in zip(results, expecteds, lengths): + assert isinstance(result, list) + assert len(result) == length + assert result == expected + + def test_lrange(self): + results = lrange(10), + expecteds = list(builtins.range(10)), lengths = 10, - actual1 = range(1, 10, 2) - actual2 = lrange(1, 10, 2) - actual += [actual1, actual2], + results += lrange(1, 10, 2), lengths += 5, - expected += list(builtins.range(1, 10, 2)), - self.check_result(actual, expected, lengths) + expecteds += list(builtins.range(1, 10, 2)), + self.check_results(results, expecteds, lengths) - def test_map(self): + def test_lmap(self): func = lambda x, y, z: x + y + z lst = [builtins.range(10), builtins.range(10), builtins.range(10)] - actual1 = map(func, *lst) - actual2 = lmap(func, *lst) - actual = [actual1, actual2], - expected = list(builtins.map(func, *lst)), + results = lmap(func, *lst), + expecteds = list(builtins.map(func, *lst)), lengths = 10, - self.check_result(actual, expected, lengths) + self.check_results(results, expecteds, lengths) - def test_filter(self): + def test_lfilter(self): func = lambda x: x lst = list(builtins.range(10)) - actual1 = filter(func, lst) - actual2 = lfilter(func, lst) - actual = [actual1, actual2], + results = lfilter(lambda x: x, lst), lengths = 9, - expected = list(builtins.filter(func, lst)), - self.check_result(actual, expected, lengths) + expecteds = list(builtins.filter(func, lst)), + self.check_results(results, expecteds, lengths) - def test_zip(self): + def test_lzip(self): lst = [builtins.range(10), builtins.range(10), builtins.range(10)] - actual = [zip(*lst), lzip(*lst)], - expected = list(builtins.zip(*lst)), + results = lzip(*lst), + expecteds = list(builtins.zip(*lst)), lengths = 10, - self.check_result(actual, expected, lengths) + self.check_results(results, expecteds, lengths) def test_dict_iterators(self): assert next(itervalues({1: 2})) == 2 diff --git a/pandas/tests/test_multilevel.py b/pandas/tests/test_multilevel.py index a9a59c6d95373..9f4fbbaaa4a24 100644 --- a/pandas/tests/test_multilevel.py +++ b/pandas/tests/test_multilevel.py @@ -9,8 +9,7 @@ import pytest import pytz -from pandas.compat import ( - StringIO, lrange, lzip, product as cart_product, range, u, zip) +from pandas.compat import StringIO, lrange, lzip, product as cart_product, u from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype diff --git a/pandas/tests/test_strings.py b/pandas/tests/test_strings.py index a2242fbea6013..cf322dc330799 100644 --- a/pandas/tests/test_strings.py +++ b/pandas/tests/test_strings.py @@ -10,7 +10,7 @@ import pytest import pandas.compat as compat -from pandas.compat import range, u +from pandas.compat import u from pandas import DataFrame, Index, MultiIndex, Series, concat, isna, notna import pandas.core.strings as strings diff --git a/pandas/tests/test_window.py b/pandas/tests/test_window.py index ce9d1888b8e96..8e2925f52c04d 100644 --- a/pandas/tests/test_window.py +++ b/pandas/tests/test_window.py @@ -8,7 +8,6 @@ from numpy.random import randn import pytest -from pandas.compat import range, zip from pandas.errors import UnsupportedFunctionCall import pandas.util._test_decorators as td diff --git a/pandas/tests/tseries/frequencies/test_inference.py b/pandas/tests/tseries/frequencies/test_inference.py index 9e7ddbc45bba8..c2ef939d1915e 100644 --- a/pandas/tests/tseries/frequencies/test_inference.py +++ b/pandas/tests/tseries/frequencies/test_inference.py @@ -6,7 +6,7 @@ from pandas._libs.tslibs.ccalendar import DAYS, MONTHS from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG import pandas.compat as compat -from pandas.compat import is_platform_windows, range +from pandas.compat import is_platform_windows from pandas import ( DatetimeIndex, Index, Series, Timestamp, date_range, period_range) diff --git a/pandas/tests/tseries/offsets/test_offsets.py b/pandas/tests/tseries/offsets/test_offsets.py index e6f21a7b47c3b..0c58e515979c2 100644 --- a/pandas/tests/tseries/offsets/test_offsets.py +++ b/pandas/tests/tseries/offsets/test_offsets.py @@ -11,7 +11,6 @@ import pandas._libs.tslibs.offsets as liboffsets from pandas._libs.tslibs.offsets import ApplyTypeError import pandas.compat as compat -from pandas.compat import range from pandas.compat.numpy import np_datetime64_compat from pandas.core.indexes.datetimes import DatetimeIndex, _to_M8, date_range diff --git a/pandas/tseries/frequencies.py b/pandas/tseries/frequencies.py index 1b782b430a1a7..bda150e5ef310 100644 --- a/pandas/tseries/frequencies.py +++ b/pandas/tseries/frequencies.py @@ -16,7 +16,6 @@ from pandas._libs.tslibs.resolution import Resolution from pandas._libs.tslibs.timezones import UTC import pandas.compat as compat -from pandas.compat import zip from pandas.util._decorators import cache_readonly from pandas.core.dtypes.common import ( diff --git a/pandas/tseries/offsets.py b/pandas/tseries/offsets.py index f208ce37a3b14..5733504342db6 100644 --- a/pandas/tseries/offsets.py +++ b/pandas/tseries/offsets.py @@ -14,7 +14,6 @@ ApplyTypeError, BaseOffset, _get_calendar, _is_normalized, _to_dt64, apply_index_wraps, as_datetime, roll_yearday, shift_month) import pandas.compat as compat -from pandas.compat import range from pandas.errors import AbstractMethodError from pandas.util._decorators import cache_readonly diff --git a/pandas/util/testing.py b/pandas/util/testing.py index dc120856b4a9a..3e4470ee30a80 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -23,8 +23,8 @@ from pandas._libs import testing as _testing import pandas.compat as compat from pandas.compat import ( - PY2, PY3, httplib, lmap, lrange, lzip, map, raise_with_traceback, range, - string_types, u, unichr, zip) + PY2, PY3, httplib, lmap, lrange, lzip, raise_with_traceback, string_types, + u, unichr) from pandas.core.dtypes.common import ( is_bool, is_categorical_dtype, is_datetime64_dtype, is_datetime64tz_dtype, @@ -50,7 +50,7 @@ _RAISE_NETWORK_ERROR_DEFAULT = False # set testing_mode -_testing_mode_warnings = (DeprecationWarning, compat.ResourceWarning) +_testing_mode_warnings = (DeprecationWarning, ResourceWarning) def set_testing_mode(): diff --git a/scripts/find_commits_touching_func.py b/scripts/find_commits_touching_func.py index a4583155b1bde..dbd85f0ca77ea 100755 --- a/scripts/find_commits_touching_func.py +++ b/scripts/find_commits_touching_func.py @@ -17,7 +17,7 @@ import os import argparse from collections import namedtuple -from pandas.compat import lrange, map, string_types, text_type, parse_date +from pandas.compat import lrange, string_types, text_type, parse_date try: import sh except ImportError: