💥 change [u]long into a platform-dependent type alias (#478)

Author: jorenham

src/numpy-stubs/@test/static/accept/ctypeslib.pyi

@@ -13,7 +13,7 @@ AR_i1: npt.NDArray[np.int8]
 AR_i2: npt.NDArray[np.int16]
 AR_i4: npt.NDArray[np.int32]
 AR_i8: npt.NDArray[np.int64]
-AR_l: npt.NDArray[np.long]
+AR_q: npt.NDArray[np.longlong]
 AR_u1: npt.NDArray[np.uint8]
 AR_u2: npt.NDArray[np.uint16]
 AR_u4: npt.NDArray[np.uint32]
@@ -81,7 +81,3 @@ assert_type(np.ctypeslib.as_array(pointer), npt.NDArray[Any])
 
 assert_type(np.ctypeslib.as_ctypes_type(int), type[ct.c_ssize_t])
 assert_type(np.ctypeslib.as_ctypes_type("N"), type[ct.c_size_t])
-assert_type(np.ctypeslib.as_ctypes(AR_l), ct.Array[ct.c_long])
-assert_type(np.ctypeslib.as_ctypes(AR_l.take(0)), ct.c_long)
-assert_type(np.ctypeslib.as_ctypes(AR_L), ct.Array[ct.c_ulong])
-assert_type(np.ctypeslib.as_ctypes(AR_L.take(0)), ct.c_ulong)

src/numpy-stubs/@test/static/accept/dtype.pyi

@@ -67,7 +67,7 @@ assert_type(np.dtype(Fraction), np.dtype[np.object_])
 
 # char-codes
 assert_type(np.dtype("u1"), np.dtype[np.uint8])
-assert_type(np.dtype("l"), np.dtype[np.long])
+assert_type(np.dtype("int_"), np.dtype[np.intp])
 assert_type(np.dtype("longlong"), np.dtype[np.longlong])
 assert_type(np.dtype(">g"), np.dtype[np.longdouble])
 assert_type(np.dtype(cs_integer), np.dtype[np.integer])

src/numpy-stubs/__init__.pyi

@@ -7902,29 +7902,12 @@ ushort = uint16
 intc = int32
 uintc = uint32
 
-class long(signedinteger[_n._32_64]):
-    @property
-    @override
-    def itemsize(self) -> L[4, 8]: ...
-    @property
-    @override
-    def nbytes(self) -> L[4, 8]: ...
-    @override
-    def __hash__(self, /) -> int: ...
-    def __index__(self, /) -> int: ...
-    def bit_count(self, /) -> int: ...
-
-class ulong(unsignedinteger[_n._32_64]):
-    @property
-    @override
-    def itemsize(self) -> L[4, 8]: ...
-    @property
-    @override
-    def nbytes(self) -> L[4, 8]: ...
-    @override
-    def __hash__(self, /) -> int: ...
-    def __index__(self, /) -> int: ...
-    def bit_count(self, /) -> int: ...
+if sys.platform == "win32":
+    long: TypeAlias = int32  # pyright: ignore[reportRedeclaration]
+    ulong: TypeAlias = uint32  # pyright: ignore[reportRedeclaration]
+else:
+    long: TypeAlias = intp  # pyright: ignore[reportRedeclaration]
+    ulong: TypeAlias = uintp  # pyright: ignore[reportRedeclaration]
 
 longlong = int64
 ulonglong = uint64

src/numpy-stubs/ctypeslib.pyi

@@ -141,10 +141,6 @@ def as_ctypes(obj: NDArray[np.int16]) -> ct.Array[ct.c_int16]: ...
 def as_ctypes(obj: np.int32) -> ct.c_int32: ...
 @overload
 def as_ctypes(obj: NDArray[np.int32]) -> ct.Array[ct.c_int32]: ...
-@overload  # long
-def as_ctypes(obj: np.long) -> ct.c_long: ...
-@overload
-def as_ctypes(obj: NDArray[np.long]) -> ct.Array[ct.c_long]: ...
 @overload  # int64 / longlong (which might be an alias for for `long`)
 def as_ctypes(obj: np.int64) -> ct.c_int64: ...
 @overload
@@ -161,10 +157,6 @@ def as_ctypes(obj: NDArray[np.uint16]) -> ct.Array[ct.c_uint16]: ...
 def as_ctypes(obj: np.uint32) -> ct.c_uint32: ...
 @overload
 def as_ctypes(obj: NDArray[np.uint32]) -> ct.Array[ct.c_uint32]: ...
-@overload  # ulong
-def as_ctypes(obj: np.ulong) -> ct.c_ulong: ...
-@overload
-def as_ctypes(obj: NDArray[np.ulong]) -> ct.Array[ct.c_ulong]: ...
 @overload  # uint64 / ulonglong
 def as_ctypes(obj: np.uint64) -> ct.c_uint64: ...
 @overload
@@ -192,23 +184,23 @@ def as_ctypes_type(dtype: _DTypeLike[np.int16] | type[ct.c_int16 | ct.c_short] |
 @overload
 def as_ctypes_type(dtype: _DTypeLike[np.int32] | type[ct.c_int32 | ct.c_int] | _Int32Codes) -> type[ct.c_int32]: ...
 @overload
-def as_ctypes_type(dtype: _DTypeLike[np.long] | type[ct.c_long] | _LongCodes) -> type[ct.c_long]: ...
-@overload
-def as_ctypes_type(dtype: _DTypeLike[np.int64] | type[ct.c_int64] | _Int64Codes) -> type[ct.c_int64]: ...
+def as_ctypes_type(dtype: type[ct.c_long] | _LongCodes) -> type[ct.c_long]: ...
 @overload
 def as_ctypes_type(dtype: type[JustInt | ct.c_ssize_t] | _IntPCodes) -> type[ct.c_ssize_t]: ...
 @overload
+def as_ctypes_type(dtype: _DTypeLike[np.int64] | type[ct.c_int64] | _Int64Codes) -> type[ct.c_int64]: ...
+@overload
 def as_ctypes_type(dtype: _DTypeLike[np.uint8] | type[ct.c_uint8 | ct.c_ubyte] | _UInt8Codes) -> type[ct.c_uint8]: ...
 @overload
 def as_ctypes_type(dtype: _DTypeLike[np.uint16] | type[ct.c_uint16 | ct.c_ushort] | _UInt16Codes) -> type[ct.c_uint16]: ...
 @overload
 def as_ctypes_type(dtype: _DTypeLike[np.uint32] | type[ct.c_uint32 | ct.c_uint] | _UInt32Codes) -> type[ct.c_uint32]: ...
 @overload
-def as_ctypes_type(dtype: _DTypeLike[np.ulong] | type[ct.c_ulong] | _ULongCodes) -> type[ct.c_ulong]: ...
+def as_ctypes_type(dtype: type[ct.c_ulong] | _ULongCodes) -> type[ct.c_ulong]: ...
 @overload
-def as_ctypes_type(dtype: _DTypeLike[np.uint64] | type[ct.c_uint64] | _UInt64Codes) -> type[ct.c_uint64]: ...
+def as_ctypes_type(dtype: type[ct.c_void_p | ct.c_size_t] | _UIntPCodes) -> type[ct.c_size_t]: ...
 @overload
-def as_ctypes_type(dtype: type[ct.c_size_t] | _UIntPCodes) -> type[ct.c_size_t]: ...
+def as_ctypes_type(dtype: _DTypeLike[np.uint64] | type[ct.c_uint64] | _UInt64Codes) -> type[ct.c_uint64]: ...
 @overload
 def as_ctypes_type(dtype: _DTypeLike[np.float32] | type[ct.c_float] | _Float32Codes) -> type[ct.c_float]: ...
 @overload