|
4 | 4 | from pandas.core.dtypes.common import ensure_platform_int |
5 | 5 |
|
6 | 6 | import pandas as pd |
7 | | -import pandas._testing as tm |
8 | | -from pandas.core.indexes.api import ( |
9 | | - Float64Index, |
| 7 | +from pandas import ( |
10 | 8 | Index, |
11 | | - Int64Index, |
12 | 9 | RangeIndex, |
13 | 10 | ) |
| 11 | +import pandas._testing as tm |
14 | 12 | from pandas.tests.indexes.common import NumericBase |
15 | 13 |
|
16 | 14 | # aliases to make some tests easier to read |
17 | 15 | RI = RangeIndex |
18 | | -I64 = Int64Index |
19 | | -F64 = Float64Index |
20 | | -OI = Index |
21 | 16 |
|
22 | 17 |
|
23 | 18 | class TestRangeIndex(NumericBase): |
@@ -111,7 +106,7 @@ def test_insert(self): |
111 | 106 | tm.assert_index_equal(idx[0:4], result.insert(0, idx[0]), exact="equiv") |
112 | 107 |
|
113 | 108 | # GH 18295 (test missing) |
114 | | - expected = Float64Index([0, np.nan, 1, 2, 3, 4]) |
| 109 | + expected = Index([0, np.nan, 1, 2, 3, 4], dtype=np.float64) |
115 | 110 | for na in [np.nan, None, pd.NA]: |
116 | 111 | result = RangeIndex(5).insert(1, na) |
117 | 112 | tm.assert_index_equal(result, expected) |
@@ -379,7 +374,7 @@ def test_nbytes(self): |
379 | 374 |
|
380 | 375 | # memory savings vs int index |
381 | 376 | idx = RangeIndex(0, 1000) |
382 | | - assert idx.nbytes < Int64Index(idx._values).nbytes / 10 |
| 377 | + assert idx.nbytes < Index(idx._values).nbytes / 10 |
383 | 378 |
|
384 | 379 | # constant memory usage |
385 | 380 | i2 = RangeIndex(0, 10) |
@@ -530,16 +525,16 @@ def test_len_specialised(self, step): |
530 | 525 | ([RI(-4, -8), RI(-8, -12)], RI(0, 0)), |
531 | 526 | ([RI(-4, -8), RI(3, -4)], RI(0, 0)), |
532 | 527 | ([RI(-4, -8), RI(3, 5)], RI(3, 5)), |
533 | | - ([RI(-4, -2), RI(3, 5)], I64([-4, -3, 3, 4])), |
| 528 | + ([RI(-4, -2), RI(3, 5)], Index([-4, -3, 3, 4])), |
534 | 529 | ([RI(-2), RI(3, 5)], RI(3, 5)), |
535 | | - ([RI(2), RI(2)], I64([0, 1, 0, 1])), |
| 530 | + ([RI(2), RI(2)], Index([0, 1, 0, 1])), |
536 | 531 | ([RI(2), RI(2, 5), RI(5, 8, 4)], RI(0, 6)), |
537 | | - ([RI(2), RI(3, 5), RI(5, 8, 4)], I64([0, 1, 3, 4, 5])), |
| 532 | + ([RI(2), RI(3, 5), RI(5, 8, 4)], Index([0, 1, 3, 4, 5])), |
538 | 533 | ([RI(-2, 2), RI(2, 5), RI(5, 8, 4)], RI(-2, 6)), |
539 | | - ([RI(3), OI([-1, 3, 15])], OI([0, 1, 2, -1, 3, 15])), |
540 | | - ([RI(3), OI([-1, 3.1, 15.0])], OI([0, 1, 2, -1, 3.1, 15.0])), |
541 | | - ([RI(3), OI(["a", None, 14])], OI([0, 1, 2, "a", None, 14])), |
542 | | - ([RI(3, 1), OI(["a", None, 14])], OI(["a", None, 14])), |
| 534 | + ([RI(3), Index([-1, 3, 15])], Index([0, 1, 2, -1, 3, 15])), |
| 535 | + ([RI(3), Index([-1, 3.1, 15.0])], Index([0, 1, 2, -1, 3.1, 15.0])), |
| 536 | + ([RI(3), Index(["a", None, 14])], Index([0, 1, 2, "a", None, 14])), |
| 537 | + ([RI(3, 1), Index(["a", None, 14])], Index(["a", None, 14])), |
543 | 538 | ] |
544 | 539 | ) |
545 | 540 | def appends(self, request): |
|
0 commit comments