8000 CLN: PY3 String/BytesIO by mroeschke · Pull Request #25954 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

CLN: PY3 String/BytesIO #25954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 3, 2019
Merged

CLN: PY3 String/BytesIO #25954

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
22470d1
CLN: PY3 String/BytesIO
Apr 2, 2019
2c9eed0
Remove io.open, forgotten compat imports
Apr 2, 2019
f465b04
leftovers
Apr 2, 2019
8cd6c2c
more leftovers
Apr 2, 2019
bead183
Remove unused imports
Apr 2, 2019
f22583f
Merge remote-tracking branch 'upstream/master' into py3_io
Apr 2, 2019
5038dde
isort
Apr 2, 2019
1abd715
Add back abc import
Apr 2, 2019
8aba059
Remove Iterable compat import
Apr 2, 2019
92ed012
Removed errant import
Apr 2, 2019
250812d
ignore type checking for BytesZipFile
Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into py3_io
  • Loading branch information
Matt Roeschke committed Apr 2, 2019
commit f22583f450623a8f774b22aeec1ac074a5bdc50b
2 changes: 0 additions & 2 deletions pandas/compat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@

try:
import __builtin__ as builtins
import cPickle
import httplib
except ImportError:
import builtins
import pickle as cPickle
import http.client as httplib

from pandas.compat.chainmap import DeepChainMap
Expand Down
3 changes: 1 addition & 2 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
validate_axis_style_args)

from pandas import compat
from pandas.compat import (
PY36, Iterator, lmap, lzip, raise_with_traceback)
from pandas.compat import PY36, lmap, lzip, raise_with_traceback
from pandas.compat.numpy import function as nv
from pandas.core.dtypes.cast import (
maybe_upcast,
Expand Down
3 changes: 2 additions & 1 deletion pandas/io/pickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
""" pickle compat """
from io import BytesIO
import pickle
import warnings

from numpy.lib.format import read_array

from pandas.compat import cPickle as pkl, pickle_compat as pc
from pandas.compat import BytesIO, pickle_compat as pc

from pandas.io.common import _get_handle, _stringify_path

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0