Skip to content

Commit 06e03c7

Browse files
committed
REF: adapt NDFrame.set_axis() calls to new signature
1 parent 185ea60 commit 06e03c7

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

pandas/core/generic.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -497,23 +497,23 @@ def _expand_axes(self, key):
497497
1 2
498498
2 3
499499
dtype: int64
500-
>>> s.set_axis(0, ['a', 'b', 'c'], inplace=False)
500+
>>> s.set_axis(['a', 'b', 'c'], axis=0, inplace=False)
501501
a 1
502502
b 2
503503
c 3
504504
dtype: int64
505505
>>> df = pd.DataFrame({"A": [1, 2, 3], "B": [4, 5, 6]})
506-
>>> df.set_axis(0, ['a', 'b', 'c'], inplace=False)
506+
>>> df.set_axis(['a', 'b', 'c'], axis=0, inplace=False)
507507
A B
508508
a 1 4
509509
b 2 5
510510
c 3 6
511-
>>> df.set_axis(1, ['I', 'II'], inplace=False)
511+
>>> df.set_axis(['I', 'II'], axis=1, inplace=False)
512512
I II
513513
0 1 4
514514
1 2 5
515515
2 3 6
516-
>>> df.set_axis(1, ['i', 'ii'], inplace=True)
516+
>>> df.set_axis(['i', 'ii'], axis=1, inplace=True)
517517
>>> df
518518
i ii
519519
0 1 4
@@ -952,7 +952,7 @@ def _set_axis_name(self, name, axis=0, inplace=False):
952952

953953
inplace = validate_bool_kwarg(inplace, 'inplace')
954954
renamed = self if inplace else self.copy()
955-
renamed.set_axis(axis, idx)
955+
renamed.set_axis(idx, axis=axis, inplace=True)
956956
if not inplace:
957957
return renamed
958958

@@ -5840,7 +5840,7 @@ def slice_shift(self, periods=1, axis=0):
58405840

58415841
new_obj = self._slice(vslicer, axis=axis)
58425842
shifted_axis = self._get_axis(axis)[islicer]
5843-
new_obj.set_axis(axis, shifted_axis)
5843+
new_obj.set_axis(shifted_axis, axis=axis, inplace=True)
58445844

58455845
return new_obj.__finalize__(self)
58465846

@@ -6000,7 +6000,7 @@ def _tz_convert(ax, tz):
60006000
ax = _tz_convert(ax, tz)
60016001

60026002
result = self._constructor(self._data, copy=copy)
6003-
result.set_axis(axis, ax)
6003+
result.set_axis(ax, axis=axis, inplace=True)
60046004
return result.__finalize__(self)
60056005

60066006
@deprecate_kwarg(old_arg_name='infer_dst', new_arg_name='ambiguous',
@@ -6068,7 +6068,7 @@ def _tz_localize(ax, tz, ambiguous):
60686068
ax = _tz_localize(ax, tz, ambiguous)
60696069

60706070
result = self._constructor(self._data, copy=copy)
6071-
result.set_axis(axis, ax)
6071+
result.set_axis(ax, axis=axis, inplace=True)
60726072
return result.__finalize__(self)
60736073

60746074
# ----------------------------------------------------------------------

pandas/core/groupby.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,11 @@ def _set_result_index_ordered(self, result):
530530
if not self.grouper.is_monotonic:
531531
index = Index(np.concatenate(
532532
self._get_indices(self.grouper.result_index)))
533-
result.set_axis(self.axis, index)
533+
result.set_axis(index, axis=self.axis, inplace=True)
534534
result = result.sort_index(axis=self.axis)
535535

536-
result.set_axis(self.axis, self.obj._get_axis(self.axis))
536+
result.set_axis(self.obj._get_axis(self.axis), axis=self.axis,
537+
inplace=True)
537538
return result
538539

539540
def _dir_additions(self):

pandas/core/reshape/pivot.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,9 @@ def _all_key(key):
311311
except TypeError:
312312

313313
# we cannot reshape, so coerce the axis
314-
piece.set_axis(cat_axis, piece._get_axis(
315-
cat_axis)._to_safe_for_reshape())
314+
piece.set_axis(piece._get_axis(
315+
cat_axis)._to_safe_for_reshape(),
316+
axis=cat_axis, inplace=True)
316317
piece[all_key] = margin[key]
317318

318319
table_pieces.append(piece)

0 commit comments

Comments
 (0)