🎨 refactor from _numtype import in _core

Author: jorenham

src/numpy-stubs/_core/_asarray.pyi

@@ -2,15 +2,15 @@ from collections.abc import Iterable
 from typing import Any, Final, Literal as L, TypeAlias, overload
 from typing_extensions import TypeVar
 
+import _numtype as _nt
 import numpy as np
-from _numtype import ToBool_nd, ToBytes_nd, ToComplex128_nd, ToFloat64_nd, ToInt_nd, ToObject_nd, ToStr_nd
-from numpy._typing import DTypeLike, NDArray, _ArrayLike, _DTypeLike, _SupportsArrayFunc as _Like
+from numpy._typing import _SupportsArrayFunc as _Like
 
 __all__ = ["require"]
 
 ###
 
-_ArrayT = TypeVar("_ArrayT", bound=NDArray[Any])
+_ArrayT = TypeVar("_ArrayT", bound=_nt.Array[Any])
 _ScalarT = TypeVar("_ScalarT", bound=np.generic[Any])
 
 _Req: TypeAlias = L[
@@ -30,89 +30,45 @@ POSSIBLE_FLAGS: Final[dict[_ReqE, L["C", "F", "A", "W", "O", "E"]]]
 
 @overload
 def require(
-    a: _ArrayT,
-    dtype: None = None,
-    requirements: _ToReqs | None = None,
-    *,
-    like: _Like | None = None,
+    a: _ArrayT, dtype: None = None, requirements: _ToReqs | None = None, *, like: _Like | None = None
 ) -> _ArrayT: ...
 @overload
 def require(
-    a: ToBool_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.bool]: ...
+    a: _nt.ToBool_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.bool]: ...
 @overload
 def require(
-    a: ToInt_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.intp]: ...
+    a: _nt.ToInt_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.intp]: ...
 @overload
 def require(
-    a: ToFloat64_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.float64]: ...
+    a: _nt.ToFloat64_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.float64]: ...
 @overload
 def require(
-    a: ToComplex128_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.complex128]: ...
+    a: _nt.ToComplex128_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.complex128]: ...
 @overload
 def require(
-    a: ToBytes_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.bytes_]: ...
+    a: _nt.ToBytes_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.bytes_]: ...
 @overload
 def require(
-    a: ToStr_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.str_]: ...
+    a: _nt.ToStr_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.str_]: ...
 @overload
 def require(
-    a: ToObject_nd,
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[np.object_]: ...
+    a: _nt.ToObject_nd, dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[np.object_]: ...
 @overload
 def require(
-    a: _ArrayLike[_ScalarT],
-    dtype: None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[_ScalarT]: ...
+    a: _nt._ToArray_nd[_ScalarT], dtype: None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[_ScalarT]: ...
 @overload
 def require(
-    a: object,
-    dtype: _DTypeLike[_ScalarT],
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[_ScalarT]: ...
+    a: object, dtype: _nt._ToDType[_ScalarT], requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[_ScalarT]: ...
 @overload
 def require(
-    a: object,
-    dtype: DTypeLike | None = None,
-    requirements: _ToReqsE | None = None,
-    *,
-    like: _Like | None = None,
-) -> NDArray[Any]: ...
+    a: object, dtype: _nt.ToDType | None = None, requirements: _ToReqsE | None = None, *, like: _Like | None = None
+) -> _nt.Array[Any]: ...