Skip to content

Commit 9caf58f

Browse files
mroeschkejreback
authored andcommitted
CLN: PY3 String/BytesIO (#25954)
1 parent 4814a28 commit 9caf58f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+128
-130
lines changed

pandas/_libs/tslibs/parsing.pyx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"""
33
Parsing functions for datetime and datetime-like strings.
44
"""
5-
import sys
65
import re
76
import time
7+
from io import StringIO
88

99
from cpython.datetime cimport datetime
1010

@@ -13,13 +13,6 @@ import numpy as np
1313

1414
import six
1515

16-
# Avoid import from outside _libs
17-
if sys.version_info.major == 2:
18-
from StringIO import StringIO
19-
else:
20-
from io import StringIO
21-
22-
2316
# dateutil compat
2417
from dateutil.tz import (tzoffset,
2518
tzlocal as _dateutil_tzlocal,

pandas/compat/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,9 @@
3939

4040
try:
4141
import __builtin__ as builtins
42-
# not writeable when instantiated with string, doesn't handle unicode well
43-
from cStringIO import StringIO as cStringIO
44-
# always writeable
45-
from StringIO import StringIO
46-
BytesIO = StringIO
4742
import httplib
4843
except ImportError:
4944
import builtins
50-
from io import StringIO, BytesIO
51-
cStringIO = StringIO
5245
import http.client as httplib
5346

5447
from pandas.compat.chainmap import DeepChainMap

pandas/core/computation/expr.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
import ast
55
from functools import partial, reduce
6+
from io import StringIO
67
import itertools as it
78
import operator
89
import tokenize
910

1011
import numpy as np
1112

12-
from pandas.compat import StringIO, lmap
13+
from pandas.compat import lmap
1314

1415
import pandas as pd
1516
from pandas import compat

pandas/core/computation/scope.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import datetime
66
import inspect
7+
from io import StringIO
78
import itertools
89
import pprint
910
import struct
@@ -12,7 +13,7 @@
1213
import numpy as np
1314

1415
from pandas._libs.tslibs import Timestamp
15-
from pandas.compat import DeepChainMap, StringIO
16+
from pandas.compat import DeepChainMap
1617

1718
from pandas.core.base import StringMixin
1819
import pandas.core.computation as compu

pandas/core/frame.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import collections
1414
from collections import OrderedDict, abc
1515
import functools
16+
from io import StringIO
1617
import itertools
1718
import sys
1819
import warnings
@@ -33,7 +34,7 @@
3334
validate_axis_style_args)
3435

3536
from pandas import compat
36-
from pandas.compat import PY36, StringIO, lmap, lzip, raise_with_traceback
37+
from pandas.compat import PY36, lmap, lzip, raise_with_traceback
3738
from pandas.compat.numpy import function as nv
3839
from pandas.core.dtypes.cast import (
3940
maybe_upcast,

pandas/core/series.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Data structure for 1-dimensional cross-sectional and time series data
33
"""
44
from collections import OrderedDict, abc
5+
from io import StringIO
56
from shutil import get_terminal_size
67
from textwrap import dedent
78
import warnings
@@ -12,7 +13,7 @@
1213

1314
from pandas._libs import iNaT, index as libindex, lib, tslibs
1415
import pandas.compat as compat
15-
from pandas.compat import PY36, StringIO
16+
from pandas.compat import PY36
1617
from pandas.compat.numpy import function as nv
1718
from pandas.util._decorators import Appender, Substitution, deprecate
1819
from pandas.util._validators import validate_bool_kwarg

pandas/io/clipboards.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
""" io on the clipboard """
2+
from io import StringIO
23
import warnings
34

45
import pandas.compat as compat
5-
from pandas.compat import StringIO
66

77
from pandas.core.dtypes.generic import ABCDataFrame
88

pandas/io/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import csv
66
import gzip
77
from http.client import HTTPException # noqa
8+
from io import BytesIO
89
import lzma
910
import mmap
1011
import os
@@ -16,7 +17,6 @@
1617
import zipfile
1718

1819
import pandas.compat as compat
19-
from pandas.compat import BytesIO
2020
from pandas.errors import ( # noqa
2121
AbstractMethodError, DtypeWarning, EmptyDataError, ParserError,
2222
ParserWarning)
@@ -411,7 +411,7 @@ def _get_handle(path_or_buf, mode, encoding=None, compression=None,
411411
return f, handles
412412

413413

414-
class BytesZipFile(zipfile.ZipFile, BytesIO):
414+
class BytesZipFile(zipfile.ZipFile, BytesIO): # type: ignore
415415
"""
416416
Wrapper for standard library class ZipFile and allow the returned file-like
417417
handle to accept byte strings via `write` method.

pandas/io/formats/csvs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"""
55

66
import csv as csvlib
7+
from io import StringIO
78
import os
89
import warnings
910
from zipfile import ZipFile
1011

1112
import numpy as np
1213

1314
from pandas._libs import writers as libwriters
14-
from pandas.compat import StringIO
1515

1616
from pandas.core.dtypes.generic import (
1717
ABCDatetimeIndex, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex)

pandas/io/formats/format.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"""
66

77
from functools import partial
8+
from io import StringIO
89
from shutil import get_terminal_size
910
from unicodedata import east_asian_width
1011

@@ -15,7 +16,7 @@
1516
from pandas._libs import lib
1617
from pandas._libs.tslib import format_array_from_datetime
1718
from pandas._libs.tslibs import NaT, Timedelta, Timestamp, iNaT
18-
from pandas.compat import StringIO, lzip
19+
from pandas.compat import lzip
1920

2021
from pandas.core.dtypes.common import (
2122
is_categorical_dtype, is_datetime64_dtype, is_datetime64tz_dtype,

0 commit comments

Comments
 (0)