8000 Rename signature fix by TomAugspurger · Pull Request #17966 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Rename signature fix #17966

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 13 commits into from
Oct 27, 2017
Merged

Rename signature fix #17966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
05efc51
BUG/REF: Handle ambiguous rename
TomAugspurger Oct 24, 2017
7c419e0
Do for panel too
TomAugspurger Oct 24, 2017
fbf246b
For panel4d
TomAugspurger Oct 24, 2017
ef77ca1
Pep8
TomAugspurger Oct 24, 2017
44e01da
Signature rewriting
TomAugspurger Oct 24, 2017
396a454
Added docs, changed to futurewarning
TomAugspurger Oct 25, 2017
3cb3fac
Move comment
TomAugspurger Oct 25, 2017
4766c24
Catch bug in rename
TomAugspurger Oct 25, 2017
ccbd75e
Fill in coverage
TomAugspurger Oct 25, 2017
d01aa20
pep8
TomAugspurger Oct 26, 2017
1c1517a
Fixed error message
TomAugspurger Oct 26, 2017
06144af
Merge remote-tracking branch 'upstream/master' into rename-sig-fix
TomAugspurger Oct 27, 2017
edcbb9a
Move to validators
TomAugspurger Oct 27, 2017
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
Fixed error message
  • Loading branch information
@TomAugspurger
TomAugspurger committed Oct 26, 2017
commit 1c1517ac968b0aeab71a553f2a8540a6e4552581
7 changes: 4 additions & 3 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2818,7 +2818,7 @@ def _validate_axis_style_args(self, args, kwargs, arg_name, method_name):

# Start by validating for consistency
if 'axis' in kwargs and any(x in kwargs for x in self._AXIS_NUMBERS):
msg = "Cannot specify both 'axis' and any of 'columns' or 'index'."
msg = "Cannot specify both 'axis' and any of 'index' or 'columns'."
raise TypeError(msg)

# First fill with explicit values provided by the user...
Expand Down Expand Up @@ -2852,8 +2852,9 @@ def _validate_axis_style_args(self, args, kwargs, arg_name, method_name):
elif len(args) == 2:
if 'axis' in kwargs:
# Unambiguously wrong
msg = "Cannot specify both {} and any of 'index' or 'columns'"
raise TypeError(msg.format(arg_name))
msg = ("Cannot specify both 'axis' and any of 'index' "
"or 'columns'")
raise TypeError(msg)

msg = ("Intepreting call\n\t'.{method_name}(a, b)' as "
"\n\t'.{method_name}(index=a, columns=b)'.\nUse named "
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/frame/test_axis_select_reindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,10 @@ def test_reindex_positional_warns(self):
def test_reindex_axis_style_raises(self):
# https://github.com/pandas-dev/pandas/issues/12392
df = pd.DataFrame({"A": [1, 2, 3], 'B': [4, 5, 6]})
with tm.assert_raises_regex(TypeError, 'Cannot 560F specify both labels'):
with tm.assert_raises_regex(TypeError, "Cannot specify both 'axis'"):
df.reindex([0, 1], ['A'], axis=1)

with tm.assert_raises_regex(TypeError, 'Cannot specify both labels'):
with tm.assert_raises_regex(TypeError, "Cannot specify both 'axis'"):
df.reindex([0, 1], ['A'], axis='index')

with tm.assert_raises_regex(TypeError, "Cannot specify both 'axis'"):
Expand Down
0