Skip to content

Commit 7b5f93e

Browse files
authored
STYLE: Inconsistent namespace - Indexes (#39992) (#40001)
1 parent db95fdc commit 7b5f93e

File tree

14 files changed

+66
-67
lines changed

14 files changed

+66
-67
lines changed

pandas/tests/indexes/common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def test_numpy_repeat(self):
355355
@pytest.mark.parametrize("klass", [list, tuple, np.array, Series])
356356
def test_where(self, klass):
357357
i = self.create_index()
358-
if isinstance(i, (pd.DatetimeIndex, pd.TimedeltaIndex)):
358+
if isinstance(i, (DatetimeIndex, TimedeltaIndex)):
359359
# where does not preserve freq
360360
i = i._with_freq(None)
361361

@@ -605,7 +605,7 @@ def test_map(self):
605605
index = self.create_index()
606606

607607
# we don't infer UInt64
608-
if isinstance(index, pd.UInt64Index):
608+
if isinstance(index, UInt64Index):
609609
expected = index.astype("int64")
610610
else:
611611
expected = index
@@ -624,13 +624,13 @@ def test_map(self):
624624
def test_map_dictlike(self, mapper):
625625

626626
index = self.create_index()
627-
if isinstance(index, pd.CategoricalIndex):
627+
if isinstance(index, CategoricalIndex):
628628
pytest.skip(f"skipping tests for {type(index)}")
629629

630630
identity = mapper(index.values, index)
631631

632632
# we don't infer to UInt64 for a dict
633-
if isinstance(index, pd.UInt64Index) and isinstance(identity, dict):
633+
if isinstance(index, UInt64Index) and isinstance(identity, dict):
634634
expected = index.astype("int64")
635635
else:
636636
expected = index

pandas/tests/indexes/datetimes/methods/test_astype.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@ def test_astype_object_tz(self, tz):
202202

203203
def test_astype_object_with_nat(self):
204204
idx = DatetimeIndex(
205-
[datetime(2013, 1, 1), datetime(2013, 1, 2), pd.NaT, datetime(2013, 1, 4)],
205+
[datetime(2013, 1, 1), datetime(2013, 1, 2), NaT, datetime(2013, 1, 4)],
206206
name="idx",
207207
)
208208
expected_list = [
209209
Timestamp("2013-01-01"),
210210
Timestamp("2013-01-02"),
211-
pd.NaT,
211+
NaT,
212212
Timestamp("2013-01-04"),
213213
]
214214
expected = Index(expected_list, dtype=object, name="idx")

pandas/tests/indexes/datetimes/test_constructors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,8 @@ def test_construction_outofbounds(self):
523523
def test_construction_with_ndarray(self):
524524
# GH 5152
525525
dates = [datetime(2013, 10, 7), datetime(2013, 10, 8), datetime(2013, 10, 9)]
526-
data = DatetimeIndex(dates, freq=pd.offsets.BDay()).values
527-
result = DatetimeIndex(data, freq=pd.offsets.BDay())
526+
data = DatetimeIndex(dates, freq=offsets.BDay()).values
527+
result = DatetimeIndex(data, freq=offsets.BDay())
528528
expected = DatetimeIndex(["2013-10-07", "2013-10-08", "2013-10-09"], freq="B")
529529
tm.assert_index_equal(result, expected)
530530

pandas/tests/indexes/datetimes/test_date_range.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ def test_range_with_millisecond_resolution(self, start_end):
10261026

10271027
def test_date_range_with_custom_holidays():
10281028
# GH 30593
1029-
freq = pd.offsets.CustomBusinessHour(start="15:00", holidays=["2020-11-26"])
1029+
freq = offsets.CustomBusinessHour(start="15:00", holidays=["2020-11-26"])
10301030
result = date_range(start="2020-11-25 15:00", periods=4, freq=freq)
10311031
expected = DatetimeIndex(
10321032
[

pandas/tests/indexes/datetimes/test_datetime.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def test_asarray_tz_naive(self):
217217
# optionally, object
218218
result = np.asarray(idx, dtype=object)
219219

220-
expected = np.array([pd.Timestamp("2000-01-01"), pd.Timestamp("2000-01-02")])
220+
expected = np.array([Timestamp("2000-01-01"), Timestamp("2000-01-02")])
221221
tm.assert_numpy_array_equal(result, expected)
222222

223223
def test_asarray_tz_aware(self):
@@ -235,7 +235,7 @@ def test_asarray_tz_aware(self):
235235

236236
# Future behavior with no warning
237237
expected = np.array(
238-
[pd.Timestamp("2000-01-01", tz=tz), pd.Timestamp("2000-01-02", tz=tz)]
238+
[Timestamp("2000-01-01", tz=tz), Timestamp("2000-01-02", tz=tz)]
239239
)
240240
result = np.asarray(idx, dtype=object)
241241

pandas/tests/indexes/multi/test_conversion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_to_frame():
9090

9191
def test_to_frame_dtype_fidelity():
9292
# GH 22420
93-
mi = pd.MultiIndex.from_arrays(
93+
mi = MultiIndex.from_arrays(
9494
[
9595
pd.date_range("19910905", periods=6, tz="US/Eastern"),
9696
[1, 1, 1, 2, 2, 2],
@@ -119,7 +119,7 @@ def test_to_frame_dtype_fidelity():
119119
def test_to_frame_resulting_column_order():
120120
# GH 22420
121121
expected = ["z", 0, "a"]
122-
mi = pd.MultiIndex.from_arrays(
122+
mi = MultiIndex.from_arrays(
123123
[["a", "b", "c"], ["x", "y", "z"], ["q", "w", "e"]], names=expected
124124
)
125125
result = mi.to_frame().columns.tolist()

pandas/tests/indexes/multi/test_drop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_single_level_drop_partially_missing_elements():
187187

188188
def test_droplevel_multiindex_one_level():
189189
# GH#37208
190-
index = pd.MultiIndex.from_tuples([(2,)], names=("b",))
190+
index = MultiIndex.from_tuples([(2,)], names=("b",))
191191
result = index.droplevel([])
192192
expected = pd.Int64Index([2], name="b")
193193
tm.assert_index_equal(result, expected)

pandas/tests/indexes/multi/test_equivalence.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ def test_equals_missing_values():
223223

224224
def test_equals_missing_values_differently_sorted():
225225
# GH#38439
226-
mi1 = pd.MultiIndex.from_tuples([(81.0, np.nan), (np.nan, np.nan)])
227-
mi2 = pd.MultiIndex.from_tuples([(np.nan, np.nan), (81.0, np.nan)])
226+
mi1 = MultiIndex.from_tuples([(81.0, np.nan), (np.nan, np.nan)])
227+
mi2 = MultiIndex.from_tuples([(np.nan, np.nan), (81.0, np.nan)])
228228
assert not mi1.equals(mi2)
229229

230-
mi2 = pd.MultiIndex.from_tuples([(81.0, np.nan), (np.nan, np.nan)])
230+
mi2 = MultiIndex.from_tuples([(81.0, np.nan), (np.nan, np.nan)])
231231
assert mi1.equals(mi2)
232232

233233

pandas/tests/indexes/multi/test_join.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import numpy as np
22
import pytest
33

4-
import pandas as pd
54
from pandas import (
65
Index,
76
MultiIndex,
@@ -54,12 +53,12 @@ def test_join_self(idx, join_type):
5453

5554
def test_join_multi():
5655
# GH 10665
57-
midx = pd.MultiIndex.from_product([np.arange(4), np.arange(4)], names=["a", "b"])
56+
midx = MultiIndex.from_product([np.arange(4), np.arange(4)], names=["a", "b"])
5857
idx = Index([1, 2, 5], name="b")
5958

6059
# inner
6160
jidx, lidx, ridx = midx.join(idx, how="inner", return_indexers=True)
62-
exp_idx = pd.MultiIndex.from_product([np.arange(4), [1, 2]], names=["a", "b"])
61+
exp_idx = MultiIndex.from_product([np.arange(4), [1, 2]], names=["a", "b"])
6362
exp_lidx = np.array([1, 2, 5, 6, 9, 10, 13, 14], dtype=np.intp)
6463
exp_ridx = np.array([0, 1, 0, 1, 0, 1, 0, 1], dtype=np.intp)
6564
tm.assert_index_equal(jidx, exp_idx)
@@ -96,8 +95,8 @@ def test_join_multi_wrong_order():
9695
# GH 25760
9796
# GH 28956
9897

99-
midx1 = pd.MultiIndex.from_product([[1, 2], [3, 4]], names=["a", "b"])
100-
midx2 = pd.MultiIndex.from_product([[1, 2], [3, 4]], names=["b", "a"])
98+
midx1 = MultiIndex.from_product([[1, 2], [3, 4]], names=["a", "b"])
99+
midx2 = MultiIndex.from_product([[1, 2], [3, 4]], names=["b", "a"])
101100

102101
join_idx, lidx, ridx = midx1.join(midx2, return_indexers=True)
103102

@@ -111,8 +110,8 @@ def test_join_multi_wrong_order():
111110
def test_join_multi_return_indexers():
112111
# GH 34074
113112

114-
midx1 = pd.MultiIndex.from_product([[1, 2], [3, 4], [5, 6]], names=["a", "b", "c"])
115-
midx2 = pd.MultiIndex.from_product([[1, 2], [3, 4]], names=["a", "b"])
113+
midx1 = MultiIndex.from_product([[1, 2], [3, 4], [5, 6]], names=["a", "b", "c"])
114+
midx2 = MultiIndex.from_product([[1, 2], [3, 4]], names=["a", "b"])
116115

117116
result = midx1.join(midx2, return_indexers=False)
118117
tm.assert_index_equal(result, midx1)

pandas/tests/indexes/multi/test_reindex.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_reindex_preserves_names_when_target_is_list_or_ndarray(idx):
5252
target = idx.copy()
5353
idx.names = target.names = [None, None]
5454

55-
other_dtype = pd.MultiIndex.from_product([[1, 2], [3, 4]])
55+
other_dtype = MultiIndex.from_product([[1, 2], [3, 4]])
5656

5757
# list & ndarray cases
5858
assert idx.reindex([])[0].names == [None, None]
@@ -73,14 +73,14 @@ def test_reindex_preserves_names_when_target_is_list_or_ndarray(idx):
7373

7474
def test_reindex_lvl_preserves_names_when_target_is_list_or_array():
7575
# GH7774
76-
idx = pd.MultiIndex.from_product([[0, 1], ["a", "b"]], names=["foo", "bar"])
76+
idx = MultiIndex.from_product([[0, 1], ["a", "b"]], names=["foo", "bar"])
7777
assert idx.reindex([], level=0)[0].names == ["foo", "bar"]
7878
assert idx.reindex([], level=1)[0].names == ["foo", "bar"]
7979

8080

8181
def test_reindex_lvl_preserves_type_if_target_is_empty_list_or_array():
8282
# GH7774
83-
idx = pd.MultiIndex.from_product([[0, 1], ["a", "b"]])
83+
idx = MultiIndex.from_product([[0, 1], ["a", "b"]])
8484
assert idx.reindex([], level=0)[0].levels[0].dtype.type == np.int64
8585
assert idx.reindex([], level=1)[0].levels[1].dtype.type == np.object_
8686

@@ -97,9 +97,9 @@ def test_reindex_base(idx):
9797

9898

9999
def test_reindex_non_unique():
100-
idx = pd.MultiIndex.from_tuples([(0, 0), (1, 1), (1, 1), (2, 2)])
100+
idx = MultiIndex.from_tuples([(0, 0), (1, 1), (1, 1), (2, 2)])
101101
a = pd.Series(np.arange(4), index=idx)
102-
new_idx = pd.MultiIndex.from_tuples([(0, 0), (1, 1), (2, 2)])
102+
new_idx = MultiIndex.from_tuples([(0, 0), (1, 1), (2, 2)])
103103

104104
msg = "cannot handle a non-unique multi-index!"
105105
with pytest.raises(ValueError, match=msg):

0 commit comments

Comments
 (0)