make core.config self-contained #25613
Conversation
pandas/core/config.py
Outdated
| @@ -53,8 +53,10 @@ | |||
| import re | |||
| import warnings | |||
|
|
|||
| import pandas.compat as compat | |||
| from pandas.compat import lmap, map, u | |||
| try: | |||
There was a problem hiding this comment.
Assuming this is targeted for 0.25 do we even need to bother with this?
There was a problem hiding this comment.
I figure until we actually start ripping out compat code (any day now I hope) its easier to leave this in and keep the ball rolling on these
There was a problem hiding this comment.
We could just wait until 0.24.2 comes out before merging this.
Codecov Report
@@ Coverage Diff @@
## master #25613 +/- ##
==========================================
- Coverage 91.26% 91.26% -0.01%
==========================================
Files 173 173
Lines 52968 52969 +1
==========================================
Hits 48340 48340
- Misses 4628 4629 +1
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #25613 +/- ##
==========================================
+ Coverage 91.26% 91.26% +<.01%
==========================================
Files 172 172
Lines 52965 52961 -4
==========================================
- Hits 48337 48334 -3
+ Misses 4628 4627 -1
Continue to review full report at Codecov.
|
|
prob simpler to wait till we start ripping PY2 out, soon, just as release 0.24.2 |
|
Another option: |
|
Just rebased. Removed the compat code, since it was only necessary for |
pandas/core/config.py
Outdated
| @@ -140,7 +137,7 @@ def _describe_option(pat='', _print_desc=True): | |||
| if len(keys) == 0: | |||
| raise OptionError('No such keys(s)') | |||
|
|
|||
| s = u('') | |||
| s = u'' | |||
There was a problem hiding this comment.
Can get rid of the u prefix now, no?
There was a problem hiding this comment.
Are we "full speed ahead" on ripping out py2? If not, let's hold off. I'd like to get this and #25757 merged since there are nice follow-ups.
There was a problem hiding this comment.
yes, you can remove PY2 things
|
lgtm. merge master ping on green. |
|
ping |
|
thanks! |
* origin/master: DOC: clean bug fix section in whatsnew (pandas-dev#25792) DOC: Fixed PeriodArray api ref (pandas-dev#25526) Move locale code out of tm, into _config (pandas-dev#25757) Unpin pycodestyle (pandas-dev#25789) Add test for rdivmod on EA array (GH23287) (pandas-dev#24047) ENH: Support datetime.timezone objects (pandas-dev#25065) Cython language level 3 (pandas-dev#24538) API: concat on sparse values (pandas-dev#25719) TST: assert_produces_warning works with filterwarnings (pandas-dev#25721) make core.config self-contained (pandas-dev#25613) CLN: replace %s syntax with .format in pandas.io.parsers (pandas-dev#24721) TST: Check pytables<3.5.1 when skipping (pandas-dev#25773) DOC: Fix typo in docstring of DataFrame.memory_usage (pandas-dev#25770) Replace dicts with OrderedDicts in groupby aggregation functions (pandas-dev#25693) TST: Fixturize tests/frame/test_missing.py (pandas-dev#25640) DOC: Improve the docsting of Series.iteritems (pandas-dev#24879) DOC: Fix function name. (pandas-dev#25751) Implementing iso_week_year support for to_datetime (pandas-dev#25541) DOC: clarify corr behaviour when using a callable (pandas-dev#25732) remove unnecessary check_output (pandas-dev#25755) # Conflicts: # doc/source/whatsnew/v0.25.0.rst
* upstream/master: (55 commits) PERF: Improve performance of StataReader (pandas-dev#25780) Speed up tokenizing of a row in csv and xstrtod parsing (pandas-dev#25784) BUG: Fix _binop for operators for serials which has more than one returns (divmod/rdivmod). (pandas-dev#25588) BUG-24971 copying blocks also considers ndim (pandas-dev#25521) CLN: Panel reference from documentation (pandas-dev#25649) ENH: Quoting column names containing spaces with backticks to use them in query and eval. (pandas-dev#24955) BUG: reading windows utf8 filenames in py3.6 (pandas-dev#25769) DOC: clean bug fix section in whatsnew (pandas-dev#25792) DOC: Fixed PeriodArray api ref (pandas-dev#25526) Move locale code out of tm, into _config (pandas-dev#25757) Unpin pycodestyle (pandas-dev#25789) Add test for rdivmod on EA array (GH23287) (pandas-dev#24047) ENH: Support datetime.timezone objects (pandas-dev#25065) Cython language level 3 (pandas-dev#24538) API: concat on sparse values (pandas-dev#25719) TST: assert_produces_warning works with filterwarnings (pandas-dev#25721) make core.config self-contained (pandas-dev#25613) CLN: replace %s syntax with .format in pandas.io.parsers (pandas-dev#24721) TST: Check pytables<3.5.1 when skipping (pandas-dev#25773) DOC: Fix typo in docstring of DataFrame.memory_usage (pandas-dev#25770) ...
Broken off from #25176