Fix NumPy >= 1.16 Support

comtypes/automation.py

@@ -301,7 +301,7 @@ def _set_value(self, value):
         elif npsupport.isndarray(value):
             # Try to convert a simple array of basic types.
             descr = value.dtype.descr[0][1]
-            typ = npsupport.numpy.ctypeslib._typecodes.get(descr)
+            typ = npsupport.typecodes.get(descr)
             if typ is None:
                 # Try for variant
                 obj = _midlSAFEARRAY(VARIANT).create(value)

comtypes/npsupport.py

@@ -78,12 +78,33 @@ def isdatetime64(value):
     return isinstance(value, datetime64)
 
 
+def _check_ctypeslib_typecodes():
+    import numpy as np
+    from numpy import ctypeslib
+    try:
+        from numpy.ctypeslib import _typecodes
+    except ImportError:
+        from numpy.ctypeslib import as_ctypes_type
+
+        ctypes_to_dtypes = {}
+
+        for tp in set(np.sctypeDict.values()):
+            try:
+                ctype_for = as_ctypes_type(tp)
+                ctypes_to_dtypes[ctype_for] = tp
+            except NotImplementedError:
+                continue
+        ctypeslib._typecodes = ctypes_to_dtypes
+    return ctypeslib._typecodes
+
+
 com_null_date64 = None
 datetime64 = None
 VARIANT_dtype = None
+typecodes = {}
 
 if HAVE_NUMPY:
-
+    typecodes = _check_ctypeslib_typecodes()
     # dtype for VARIANT. This allows for packing of variants into an array, and
     # subsequent conversion to a multi-dimensional safearray.
     try:

comtypes/safearray.py

@@ -160,7 +160,7 @@ def create_from_ndarray(cls, value, extra, lBound=0):
                 ai = value.__array_interface__
                 if ai["version"] != 3:
                     raise TypeError("only __array_interface__ version 3 supported")
-                if cls._itemtype_ != numpy.ctypeslib._typecodes[ai["typestr"]]:
+                if cls._itemtype_ != npsupport.typecodes[ai["typestr"]]:
                     raise TypeError("Wrong array item type")
 
             # SAFEARRAYs have Fortran order; convert the numpy array if needed
@@ -308,7 +308,7 @@ def _get_elements_raw(self, num_elements):
                         # XXX Only try to convert types known to
                         #     numpy.ctypeslib.
                         if (safearray_as_ndarray and self._itemtype_ in
-                                numpy.ctypeslib._typecodes.values()):
+                                npsupport.typecodes.values()):
                             arr = numpy.ctypeslib.as_array(ptr,
                                                            (num_elements,))
                             return arr.copy()