CLN: Misc PY2/3 compat functions #26008

mroeschke · 2019-04-06T05:42:59Z

xref CLN: remove PY2 #25725
tests added / passed
passes git diff upstream/master -u -- "*.py" | flake8 --diff
Import from pandas.compat.chainmap import DeepChainMap directly where used
Removed isidentifier, str_to_bytes, bytes_to_str, bind_method

jbrockmendel · 2019-04-06T06:11:06Z

pandas/io/clipboards.py

-                            get_option('display.encoding'))
-        )
+        text = text.decode(kwargs.get('encoding') or
+                           get_option('display.encoding'))
    except AttributeError:


Maybe take the getoption outside of the try/except?

Hmm...that encoding logic is specific to the try-except block. I'm not sure we should be putting it outside.

In addition, since this is supposed to be pure removal, I'm uneasy about making other changes beyond the stated purpose of removing PY2 / 3 things.

Fine by me. Moved back in the try except.

jbrockmendel · 2019-04-06T06:12:11Z

pandas/tests/io/json/test_ujson.py

@@ -654,7 +654,7 @@ def test_decode_big_escape(self):
        # Make sure no Exception is raised.
        for _ in range(10):
            base = '\u00e5'.encode("utf-8")
-            quote = compat.str_to_bytes("\"")
+            quote = "\"".encode('ascii')


codecov · 2019-04-06T17:42:59Z

Codecov Report

Merging #26008 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #26008      +/-   ##
==========================================
+ Coverage   91.82%   91.83%   +<.01%     
==========================================
  Files         175      175              
  Lines       52551    52531      -20     
==========================================
- Hits        48256    48240      -16     
+ Misses       4295     4291       -4

Flag	Coverage Δ
#multiple	`90.39% <100%> (+0.01%)`	⬆️
#single	`40.72% <66.66%> (-0.14%)`	⬇️

Impacted Files	Coverage Δ
pandas/io/clipboards.py	`100% <ø> (ø)`	⬆️
pandas/compat/__init__.py	`79.2% <100%> (+3.37%)`	⬆️
pandas/core/ops.py	`91.72% <100%> (-0.02%)`	⬇️
pandas/core/computation/scope.py	`93.13% <100%> (ø)`	⬆️
pandas/core/computation/pytables.py	`90.24% <100%> (ø)`	⬆️
pandas/io/common.py	`91.87% <100%> (ø)`	⬆️
pandas/core/generic.py	`93.54% <100%> (ø)`	⬆️
pandas/io/gbq.py	`75% <0%> (-12.5%)`	⬇️
pandas/core/frame.py	`96.79% <0%> (-0.12%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a1fee91...598f415. Read the comment docs.

codecov · 2019-04-06T17:43:00Z

Codecov Report

Merging #26008 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #26008      +/-   ##
==========================================
+ Coverage   91.82%   91.83%   +<.01%     
==========================================
  Files         175      175              
  Lines       52540    52517      -23     
==========================================
- Hits        48247    48228      -19     
+ Misses       4293     4289       -4

Flag	Coverage Δ
#multiple	`90.39% <100%> (+0.01%)`	⬆️
#single	`40.72% <66.66%> (-0.14%)`	⬇️

Impacted Files	Coverage Δ
pandas/io/clipboards.py	`100% <ø> (ø)`	⬆️
pandas/compat/__init__.py	`77.9% <100%> (+3.37%)`	⬆️
pandas/core/ops.py	`91.72% <100%> (-0.02%)`	⬇️
pandas/core/computation/scope.py	`93.13% <100%> (ø)`	⬆️
pandas/core/computation/pytables.py	`90.24% <100%> (ø)`	⬆️
pandas/io/common.py	`91.83% <100%> (-0.05%)`	⬇️
pandas/core/generic.py	`93.54% <100%> (ø)`	⬆️
pandas/io/gbq.py	`75% <0%> (-12.5%)`	⬇️
pandas/core/frame.py	`96.79% <0%> (-0.12%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0610a60...82a353f. Read the comment docs.

jreback · 2019-04-07T21:29:27Z

can you merge master

jbrockmendel · 2019-04-08T18:23:17Z

pandas/tests/io/formats/test_printing.py

@@ -27,7 +26,7 @@ def test_repr_binary_type():
        raw = bytes(letters, encoding=cf.get_option('display.encoding'))
    except TypeError:
        raw = bytes(letters)
-    b = str(compat.bytes_to_str(raw))
+    b = str(raw.decode('utf-8'))


not a big deal, but is the str still necessary?

Probably not...should test in a separate commit nonetheless.

jbrockmendel · 2019-04-08T18:23:37Z

pandas/tests/io/json/test_ujson.py

@@ -654,7 +654,7 @@ def test_decode_big_escape(self):
        # Make sure no Exception is raised.
        for _ in range(10):
            base = '\u00e5'.encode("utf-8")
-            quote = compat.str_to_bytes("\"")
+            quote = b"\""


would b'"' be clearer by avoiding the backslash?

I would think so.

jbrockmendel · 2019-04-08T18:23:57Z

@jreback rebased+green

mroeschke · 2019-04-08T21:29:28Z

I think these are flaky tests. They pass locally for me and don't relate to changes this PR makes.

_ TestCategoricalSeriesAnalytics.test_drop_duplicates_categorical_non_bool[True-datetime64[D]] _
[gw1] linux -- Python 3.6.6 /home/travis/miniconda3/envs/pandas-dev/bin/python
[XPASS(strict)] GH#7996
_ TestCategoricalSeriesAnalytics.test_drop_duplicates_categorical_non_bool[False-datetime64[D]] _
[gw1] linux -- Python 3.6.6 /home/travis/miniconda3/envs/pandas-dev/bin/python
[XPASS(strict)] GH#7996

jreback · 2019-04-08T21:43:32Z

yeah have seen these and can’t repro either

jreback · 2019-04-09T11:20:22Z

thanks @mroeschke

CLN: Misc PY2/3 compat functions

eb2f904

mroeschke added 2/3 Compat Clean labels Apr 6, 2019

mroeschke added this to the 0.25.0 milestone Apr 6, 2019

Remove import

5853e4b

jbrockmendel reviewed Apr 6, 2019

View reviewed changes

Fix bind_method replacement

598f415

Remove unused imports

8b03b78

Matt Roeschke added 3 commits April 7, 2019 16:51

Merge remote-tracking branch 'upstream/master' into py3_more_misc

4b01487

Retrigger CI

89c1901

Put encoding sourcing in try except

969a4e7

jbrockmendel reviewed Apr 8, 2019

View reviewed changes

Matt Roeschke added 2 commits April 8, 2019 11:55

Clarify quote argument

a45354a

Retrigger CI

56abc64

Merge remote-tracking branch 'upstream/master' into py3_more_misc

82a353f

jreback merged commit af0ecbe into pandas-dev:master Apr 9, 2019

mroeschke deleted the py3_more_misc branch April 9, 2019 17:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLN: Misc PY2/3 compat functions #26008

CLN: Misc PY2/3 compat functions #26008

mroeschke commented Apr 6, 2019

jbrockmendel Apr 6, 2019 •

edited by gfyoung

Loading

gfyoung Apr 8, 2019

mroeschke Apr 8, 2019

jbrockmendel Apr 6, 2019

codecov bot commented Apr 6, 2019

codecov bot commented Apr 6, 2019 •

edited

Loading

jreback commented Apr 7, 2019

jbrockmendel Apr 8, 2019

gfyoung Apr 8, 2019 •

edited

Loading

jbrockmendel Apr 8, 2019

gfyoung Apr 8, 2019

jbrockmendel commented Apr 8, 2019

mroeschke commented Apr 8, 2019

jreback commented Apr 8, 2019

jreback commented Apr 9, 2019

CLN: Misc PY2/3 compat functions #26008

CLN: Misc PY2/3 compat functions #26008

Conversation

mroeschke commented Apr 6, 2019

jbrockmendel Apr 6, 2019 • edited by gfyoung Loading

Choose a reason for hiding this comment

gfyoung Apr 8, 2019

Choose a reason for hiding this comment

mroeschke Apr 8, 2019

Choose a reason for hiding this comment

jbrockmendel Apr 6, 2019

Choose a reason for hiding this comment

codecov bot commented Apr 6, 2019

Codecov Report

codecov bot commented Apr 6, 2019 • edited Loading

Codecov Report

jreback commented Apr 7, 2019

jbrockmendel Apr 8, 2019

Choose a reason for hiding this comment

gfyoung Apr 8, 2019 • edited Loading

Choose a reason for hiding this comment

jbrockmendel Apr 8, 2019

Choose a reason for hiding this comment

gfyoung Apr 8, 2019

Choose a reason for hiding this comment

jbrockmendel commented Apr 8, 2019

mroeschke commented Apr 8, 2019

jreback commented Apr 8, 2019

jreback commented Apr 9, 2019

jbrockmendel Apr 6, 2019 •

edited by gfyoung

Loading

codecov bot commented Apr 6, 2019 •

edited

Loading

gfyoung Apr 8, 2019 •

edited

Loading