Skip to content

Commit 3630fc7

Browse files
committed
more clean-ups
1 parent f6dccc1 commit 3630fc7

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

pandas/_testing/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ def makeNumericIndex(k=10, name=None, *, dtype):
315315
else:
316316
raise NotImplementedError(f"wrong dtype {dtype}")
317317

318-
return Index(values, dtype=dtype, name=name)
318+
return NumericIndex(values, dtype=dtype, name=name)
319319

320320

321321
def makeIntIndex(k=10, name=None):

pandas/core/indexes/numeric.py

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,14 @@ def _ensure_dtype(cls, dtype: Dtype | None) -> np.dtype | None:
197197
"""
198198
Ensure int64 dtype for Int64Index etc. but allow int32 etc. for NumericIndex.
199199
200-
Assumed dtype has already been validated.
200+
Assumes dtype has already been validated.
201201
"""
202202
if dtype is None:
203203
return cls._default_dtype
204204

205205
dtype = pandas_dtype(dtype)
206206
assert isinstance(dtype, np.dtype)
207-
208-
if cls._default_dtype is None:
209-
return dtype
210-
else:
211-
return cls._default_dtype
207+
return dtype
212208

213209
def __contains__(self, key) -> bool:
214210
"""
@@ -357,6 +353,16 @@ class IntegerIndex(NumericIndex):
357353

358354
_is_numeric_index: bool = False
359355

356+
@classmethod
357+
@doc(NumericIndex._ensure_dtype)
358+
def _ensure_dtype(cls, dtype: Dtype | None) -> np.dtype | None:
359+
if dtype is None:
360+
return cls._default_dtype
361+
dtype = pandas_dtype(dtype)
362+
assert isinstance(dtype, np.dtype)
363+
364+
return cls._default_dtype
365+
360366
@property
361367
def asi8(self) -> np.ndarray:
362368
# do not cache or you'll create a memory leak
@@ -422,3 +428,13 @@ class Float64Index(NumericIndex):
422428
_default_dtype = np.dtype(np.float64)
423429
_dtype_validation_metadata = (is_float_dtype, "float")
424430
_is_numeric_index: bool = False
431+
432+
@classmethod
433+
@doc(NumericIndex._ensure_dtype)
434+
def _ensure_dtype(cls, dtype: Dtype | None) -> np.dtype | None:
435+
if dtype is None:
436+
return cls._default_dtype
437+
dtype = pandas_dtype(dtype)
438+
assert isinstance(dtype, np.dtype)
439+
440+
return cls._default_dtype

0 commit comments

Comments
 (0)