From 071185517b6fbd2a69597cdf1c4b76a3f21e1d01 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Tue, 24 Dec 2019 21:40:20 +0000 Subject: [PATCH] Fix abc import patterns --- pandas/io/common.py | 6 +++--- pandas/io/json/_json.py | 5 ++--- pandas/io/parsers.py | 7 +++---- pandas/io/sas/sas7bdat.py | 4 ++-- pandas/io/sas/sas_xport.py | 4 ++-- pandas/io/stata.py | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pandas/io/common.py b/pandas/io/common.py index e165f8baef3e6..43cd7d81ae4cd 100644 --- a/pandas/io/common.py +++ b/pandas/io/common.py @@ -2,7 +2,7 @@ import bz2 import codecs -from collections.abc import Iterator +from collections import abc import gzip from io import BufferedIOBase, BytesIO import mmap @@ -503,7 +503,7 @@ def closed(self): return self.fp is None -class _MMapWrapper(Iterator): +class _MMapWrapper(abc.Iterator): """ Wrapper for the Python's mmap class so that it can be properly read in by Python's csv.reader class. @@ -540,7 +540,7 @@ def __next__(self) -> str: return newline -class UTF8Recoder(Iterator): +class UTF8Recoder(abc.Iterator): """ Iterator that reads an encoded stream and re-encodes the input to UTF-8 """ diff --git a/pandas/io/json/_json.py b/pandas/io/json/_json.py index 086a486a2ec9a..c22089b4e1eae 100644 --- a/pandas/io/json/_json.py +++ b/pandas/io/json/_json.py @@ -1,5 +1,4 @@ -from collections import OrderedDict -from collections.abc import Iterator +from collections import OrderedDict, abc import functools from io import StringIO from itertools import islice @@ -610,7 +609,7 @@ def read_json( return result -class JsonReader(Iterator): +class JsonReader(abc.Iterator): """ JsonReader provides an interface for reading in a JSON file. diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 17e275b84f451..4d837af60c3e3 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -2,8 +2,7 @@ Module contains tools for processing files into DataFrames or other objects """ -from collections import defaultdict -from collections.abc import Iterator +from collections import abc, defaultdict import csv import datetime from io import StringIO @@ -786,7 +785,7 @@ def read_fwf( return _read(filepath_or_buffer, kwds) -class TextFileReader(Iterator): +class TextFileReader(abc.Iterator): """ Passed dialect overrides any of the related parser options @@ -3582,7 +3581,7 @@ def _get_col_names(colspec, columns): return colnames -class FixedWidthReader(Iterator): +class FixedWidthReader(abc.Iterator): """ A reader of fixed-width lines. """ diff --git a/pandas/io/sas/sas7bdat.py b/pandas/io/sas/sas7bdat.py index 47af37562f7b6..f917477b81489 100644 --- a/pandas/io/sas/sas7bdat.py +++ b/pandas/io/sas/sas7bdat.py @@ -13,7 +13,7 @@ Reference for binary data compression: http://collaboration.cmc.ec.gc.ca/science/rpn/biblio/ddj/Website/articles/CUJ/1992/9210/ross/ross.htm """ -from collections.abc import Iterator +from collections import abc from datetime import datetime import struct @@ -37,7 +37,7 @@ class _column: # SAS7BDAT represents a SAS data file in SAS7BDAT format. -class SAS7BDATReader(Iterator): +class SAS7BDATReader(abc.Iterator): """ Read SAS files in SAS7BDAT format. diff --git a/pandas/io/sas/sas_xport.py b/pandas/io/sas/sas_xport.py index f30de1327939f..3cf7fd885e564 100644 --- a/pandas/io/sas/sas_xport.py +++ b/pandas/io/sas/sas_xport.py @@ -7,7 +7,7 @@ https://support.sas.com/techsup/technote/ts140.pdf """ -from collections.abc import Iterator +from collections import abc from datetime import datetime from io import BytesIO import struct @@ -251,7 +251,7 @@ def _parse_float_vec(vec): return ieee -class XportReader(Iterator): +class XportReader(abc.Iterator): __doc__ = _xport_reader_doc def __init__( diff --git a/pandas/io/stata.py b/pandas/io/stata.py index fc54a1fa2370d..1f8c6968359c1 100644 --- a/pandas/io/stata.py +++ b/pandas/io/stata.py @@ -9,7 +9,7 @@ You can find more information on http://presbrey.mit.edu/PyDTA and http://www.statsmodels.org/devel/ """ -from collections.abc import Iterator +from collections import abc import datetime from io import BytesIO import os @@ -1010,7 +1010,7 @@ def __init__(self): ) -class StataReader(StataParser, Iterator): +class StataReader(StataParser, abc.Iterator): __doc__ = _stata_reader_doc def __init__(