@@ -69,11 +69,12 @@ def assert_level_reference(frame, levels, axis):
69
69
# ---------
70
70
def test_is_level_or_label_reference_df_simple (df_levels , axis ):
71
71
72
+ axis = df_levels ._get_axis_number (axis )
72
73
# Compute expected labels and levels
73
74
expected_labels , expected_levels = get_labels_levels (df_levels )
74
75
75
76
# Transpose frame if axis == 1
76
- if axis in { 1 , "columns" } :
77
+ if axis == 1 :
77
78
df_levels = df_levels .T
78
79
79
80
# Perform checks
@@ -83,8 +84,10 @@ def test_is_level_or_label_reference_df_simple(df_levels, axis):
83
84
84
85
def test_is_level_reference_df_ambig (df_ambig , axis ):
85
86
87
+ axis = df_ambig ._get_axis_number (axis )
88
+
86
89
# Transpose frame if axis == 1
87
- if axis in { 1 , "columns" } :
90
+ if axis == 1 :
88
91
df_ambig = df_ambig .T
89
92
90
93
# 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):
130
133
# ---------
131
134
def test_check_label_or_level_ambiguity_df (df_ambig , axis ):
132
135
136
+ axis = df_ambig ._get_axis_number (axis )
133
137
# Transpose frame if axis == 1
134
- if axis in { 1 , "columns" } :
138
+ if axis == 1 :
135
139
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 :
140
140
msg = "'L1' is both a column level and an index label"
141
141
142
+ else :
143
+ msg = "'L1' is both an index level and a column label"
142
144
# df_ambig has both an on-axis level and off-axis label named L1
143
145
# Therefore, L1 is ambiguous.
144
146
with pytest .raises (ValueError , match = msg ):
@@ -181,8 +183,9 @@ def test_check_label_or_level_ambiguity_series_axis1_error(df):
181
183
# Test _get_label_or_level_values
182
184
# ===============================
183
185
def assert_label_values (frame , labels , axis ):
186
+ axis = frame ._get_axis_number (axis )
184
187
for label in labels :
185
- if axis in { 0 , "index" } :
188
+ if axis == 0 :
186
189
expected = frame [label ]._values
187
190
else :
188
191
expected = frame .loc [label ]._values
@@ -192,8 +195,9 @@ def assert_label_values(frame, labels, axis):
192
195
193
196
194
197
def assert_level_values (frame , levels , axis ):
198
+ axis = frame ._get_axis_number (axis )
195
199
for level in levels :
196
- if axis in { 0 , "index" } :
200
+ if axis == 0 :
197
201
expected = frame .index .get_level_values (level = level )._values
198
202
else :
199
203
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):
209
213
# Compute expected labels and levels
210
214
expected_labels , expected_levels = get_labels_levels (df_levels )
211
215
216
+ axis = df_levels ._get_axis_number (axis )
212
217
# Transpose frame if axis == 1
213
- if axis in { 1 , "columns" } :
218
+ if axis == 1 :
214
219
df_levels = df_levels .T
215
220
216
221
# Perform checks
@@ -220,8 +225,9 @@ def test_get_label_or_level_values_df_simple(df_levels, axis):
220
225
221
226
def test_get_label_or_level_values_df_ambig (df_ambig , axis ):
222
227
228
+ axis = df_ambig ._get_axis_number (axis )
223
229
# Transpose frame if axis == 1
224
- if axis in { 1 , "columns" } :
230
+ if axis == 1 :
225
231
df_ambig = df_ambig .T
226
232
227
233
# 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):
233
239
234
240
def test_get_label_or_level_values_df_duplabels (df_duplabels , axis ):
235
241
242
+ axis = df_duplabels ._get_axis_number (axis )
236
243
# Transpose frame if axis == 1
237
- if axis in { 1 , "columns" } :
244
+ if axis == 1 :
238
245
df_duplabels = df_duplabels .T
239
246
240
247
# df has unambiguous level 'L1'
@@ -244,7 +251,7 @@ def test_get_label_or_level_values_df_duplabels(df_duplabels, axis):
244
251
assert_label_values (df_duplabels , ["L3" ], axis = axis )
245
252
246
253
# df has duplicate labels 'L2'
247
- if axis in { 0 , "index" } :
254
+ if axis == 0 :
248
255
expected_msg = "The column label 'L2' is not unique"
249
256
else :
250
257
expected_msg = "The index label 'L2' is not unique"
@@ -278,10 +285,11 @@ def test_get_label_or_level_values_series_axis1_error(df):
278
285
# Test _drop_labels_or_levels
279
286
# ===========================
280
287
def assert_labels_dropped (frame , labels , axis ):
288
+ axis = frame ._get_axis_number (axis )
281
289
for label in labels :
282
290
df_dropped = frame ._drop_labels_or_levels (label , axis = axis )
283
291
284
- if axis in { 0 , "index" } :
292
+ if axis == 0 :
285
293
assert label in frame .columns
286
294
assert label not in df_dropped .columns
287
295
else :
@@ -290,10 +298,11 @@ def assert_labels_dropped(frame, labels, axis):
290
298
291
299
292
300
def assert_levels_dropped (frame , levels , axis ):
301
+ axis = frame ._get_axis_number (axis )
293
302
for level in levels :
294
303
df_dropped = frame ._drop_labels_or_levels (level , axis = axis )
295
304
296
- if axis in { 0 , "index" } :
305
+ if axis == 0 :
297
306
assert level in frame .index .names
298
307
assert level not in df_dropped .index .names
299
308
else :
@@ -308,8 +317,9 @@ def test_drop_labels_or_levels_df(df_levels, axis):
308
317
# Compute expected labels and levels
309
318
expected_labels , expected_levels = get_labels_levels (df_levels )
310
319
320
+ axis = df_levels ._get_axis_number (axis )
311
321
# Transpose frame if axis == 1
312
- if axis in { 1 , "columns" } :
322
+ if axis == 1 :
313
323
df_levels = df_levels .T
314
324
315
325
# Perform checks
0 commit comments