Skip to content

Commit 5410fb7

Browse files
authored
REF: Replacing axis in with _get_axis_number(axis) (#43131)
1 parent e8f3593 commit 5410fb7

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

pandas/tests/generic/test_label_or_level_utils.py

+26-16
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,12 @@ def assert_level_reference(frame, levels, axis):
6969
# ---------
7070
def test_is_level_or_label_reference_df_simple(df_levels, axis):
7171

72+
axis = df_levels._get_axis_number(axis)
7273
# Compute expected labels and levels
7374
expected_labels, expected_levels = get_labels_levels(df_levels)
7475

7576
# Transpose frame if axis == 1
76-
if axis in {1, "columns"}:
77+
if axis == 1:
7778
df_levels = df_levels.T
7879

7980
# Perform checks
@@ -83,8 +84,10 @@ def test_is_level_or_label_reference_df_simple(df_levels, axis):
8384

8485
def test_is_level_reference_df_ambig(df_ambig, axis):
8586

87+
axis = df_ambig._get_axis_number(axis)
88+
8689
# Transpose frame if axis == 1
87-
if axis in {1, "columns"}:
90+
if axis == 1:
8891
df_ambig = df_ambig.T
8992

9093
# df has both an on-axis level and off-axis label named L1
@@ -130,15 +133,14 @@ def test_is_level_reference_series_axis1_error(df):
130133
# ---------
131134
def test_check_label_or_level_ambiguity_df(df_ambig, axis):
132135

136+
axis = df_ambig._get_axis_number(axis)
133137
# Transpose frame if axis == 1
134-
if axis in {1, "columns"}:
138+
if axis == 1:
135139
df_ambig = df_ambig.T
136-
137-
if axis in {0, "index"}:
138-
msg = "'L1' is both an index level and a column label"
139-
else:
140140
msg = "'L1' is both a column level and an index label"
141141

142+
else:
143+
msg = "'L1' is both an index level and a column label"
142144
# df_ambig has both an on-axis level and off-axis label named L1
143145
# Therefore, L1 is ambiguous.
144146
with pytest.raises(ValueError, match=msg):
@@ -181,8 +183,9 @@ def test_check_label_or_level_ambiguity_series_axis1_error(df):
181183
# Test _get_label_or_level_values
182184
# ===============================
183185
def assert_label_values(frame, labels, axis):
186+
axis = frame._get_axis_number(axis)
184187
for label in labels:
185-
if axis in {0, "index"}:
188+
if axis == 0:
186189
expected = frame[label]._values
187190
else:
188191
expected = frame.loc[label]._values
@@ -192,8 +195,9 @@ def assert_label_values(frame, labels, axis):
192195

193196

194197
def assert_level_values(frame, levels, axis):
198+
axis = frame._get_axis_number(axis)
195199
for level in levels:
196-
if axis in {0, "index"}:
200+
if axis == 0:
197201
expected = frame.index.get_level_values(level=level)._values
198202
else:
199203
expected = frame.columns.get_level_values(level=level)._values
@@ -209,8 +213,9 @@ def test_get_label_or_level_values_df_simple(df_levels, axis):
209213
# Compute expected labels and levels
210214
expected_labels, expected_levels = get_labels_levels(df_levels)
211215

216+
axis = df_levels._get_axis_number(axis)
212217
# Transpose frame if axis == 1
213-
if axis in {1, "columns"}:
218+
if axis == 1:
214219
df_levels = df_levels.T
215220

216221
# Perform checks
@@ -220,8 +225,9 @@ def test_get_label_or_level_values_df_simple(df_levels, axis):
220225

221226
def test_get_label_or_level_values_df_ambig(df_ambig, axis):
222227

228+
axis = df_ambig._get_axis_number(axis)
223229
# Transpose frame if axis == 1
224-
if axis in {1, "columns"}:
230+
if axis == 1:
225231
df_ambig = df_ambig.T
226232

227233
# df has an on-axis level named L2, and it is not ambiguous.
@@ -233,8 +239,9 @@ def test_get_label_or_level_values_df_ambig(df_ambig, axis):
233239

234240
def test_get_label_or_level_values_df_duplabels(df_duplabels, axis):
235241

242+
axis = df_duplabels._get_axis_number(axis)
236243
# Transpose frame if axis == 1
237-
if axis in {1, "columns"}:
244+
if axis == 1:
238245
df_duplabels = df_duplabels.T
239246

240247
# df has unambiguous level 'L1'
@@ -244,7 +251,7 @@ def test_get_label_or_level_values_df_duplabels(df_duplabels, axis):
244251
assert_label_values(df_duplabels, ["L3"], axis=axis)
245252

246253
# df has duplicate labels 'L2'
247-
if axis in {0, "index"}:
254+
if axis == 0:
248255
expected_msg = "The column label 'L2' is not unique"
249256
else:
250257
expected_msg = "The index label 'L2' is not unique"
@@ -278,10 +285,11 @@ def test_get_label_or_level_values_series_axis1_error(df):
278285
# Test _drop_labels_or_levels
279286
# ===========================
280287
def assert_labels_dropped(frame, labels, axis):
288+
axis = frame._get_axis_number(axis)
281289
for label in labels:
282290
df_dropped = frame._drop_labels_or_levels(label, axis=axis)
283291

284-
if axis in {0, "index"}:
292+
if axis == 0:
285293
assert label in frame.columns
286294
assert label not in df_dropped.columns
287295
else:
@@ -290,10 +298,11 @@ def assert_labels_dropped(frame, labels, axis):
290298

291299

292300
def assert_levels_dropped(frame, levels, axis):
301+
axis = frame._get_axis_number(axis)
293302
for level in levels:
294303
df_dropped = frame._drop_labels_or_levels(level, axis=axis)
295304

296-
if axis in {0, "index"}:
305+
if axis == 0:
297306
assert level in frame.index.names
298307
assert level not in df_dropped.index.names
299308
else:
@@ -308,8 +317,9 @@ def test_drop_labels_or_levels_df(df_levels, axis):
308317
# Compute expected labels and levels
309318
expected_labels, expected_levels = get_labels_levels(df_levels)
310319

320+
axis = df_levels._get_axis_number(axis)
311321
# Transpose frame if axis == 1
312-
if axis in {1, "columns"}:
322+
if axis == 1:
313323
df_levels = df_levels.T
314324

315325
# Perform checks

0 commit comments

Comments
 (0)