Merge pull request scipy#11384 from eric-wieser/patch-4

MAINT: Use numpy scalar types directly
pvanmulbregt · Jan 17, 2020 · c3ad98b · c3ad98b
2 parents 0d4e1e8 + 8bd2e85
commit c3ad98b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/scipy/sparse/sputils.py b/scipy/sparse/sputils.py
@@ -11,10 +11,9 @@
 __all__ = ['upcast', 'getdtype', 'isscalarlike', 'isintlike',
            'isshape', 'issequence', 'isdense', 'ismatrix', 'get_sum_dtype']
 
-supported_dtypes = ['bool', 'int8', 'uint8', 'short', 'ushort', 'intc',
-                    'uintc', 'l', 'L', 'longlong', 'ulonglong', 'single', 'double',
-                    'longdouble', 'csingle', 'cdouble', 'clongdouble']
-supported_dtypes = [np.typeDict[x] for x in supported_dtypes]
+supported_dtypes = [np.bool_, np.byte, np.ubyte, np.short, np.ushort, np.intc,
+                    np.uintc, np.int_, np.uint, np.longlong, np.ulonglong, np.single, np.double,
+                    np.longdouble, np.csingle, np.cdouble, np.clongdouble]
 
 _upcast_memo = {}