Merge branch 'master' into 52/array-deepcopy-module-import

Author: flexatone

src/_arraykit.c

@@ -120,6 +120,7 @@ AK_ResolveDTypeIter(PyObject *dtypes)
 {
     PyObject *iterator = PyObject_GetIter(dtypes);
     if (iterator == NULL) {
+        // No need to set exception here. GetIter already sets TypeError
         return NULL;
     }
     PyArray_Descr *resolved = NULL;
@@ -147,6 +148,10 @@ AK_ResolveDTypeIter(PyObject *dtypes)
         }
     }
     Py_DECREF(iterator);
+    if (!resolved) {
+        // this could happen if this function gets an empty tuple
+        PyErr_SetString(PyExc_ValueError, "iterable passed to resolve dtypes is empty");
+    }
     return resolved;
 }
 
@@ -193,11 +198,12 @@ AK_ArrayDeepCopy(PyObject* m, PyArrayObject *array, PyObject *memo)
                 array,
                 dtype,
                 NPY_ARRAY_ENSURECOPY);
-        if (memo) {
-            if (!array_new || PyDict_SetItem(memo, id, array_new)) {
-                Py_XDECREF(array_new);
-                goto error;
-            }
+        if (!array_new) {
+            goto error;
+        }
+        if (memo && PyDict_SetItem(memo, id, array_new)) {
+            Py_DECREF(array_new);
+            goto error;
         }
     }
     // set immutable
@@ -771,7 +777,11 @@ static PyMethodDef arraykit_methods[] =  {
 };
 
 static struct PyModuleDef arraykit_module = {
-    PyModuleDef_HEAD_INIT, "_arraykit", NULL, -1, arraykit_methods,
+    PyModuleDef_HEAD_INIT, 
+    .m_name = "_arraykit", 
+    .m_doc = NULL, 
+    .m_size = -1, 
+    .m_methods = arraykit_methods,
 };
 
 PyObject *

test/test_util.py

@@ -1,3 +1,4 @@
+import pytest
 import collections
 import datetime
 import unittest
@@ -117,6 +118,14 @@ def test_resolve_dtype_iter_a(self) -> None:
         self.assertEqual(resolve_dtype_iter((a3.dtype, a5.dtype)).kind, 'U')
         self.assertEqual(resolve_dtype_iter((a3.dtype, a5.dtype)).itemsize, 40)
 
+        with pytest.raises(TypeError):
+            resolve_dtype_iter((a3.dtype, int))
+
+        self.assertEqual(resolve_dtype_iter((a1.dtype,)), a1.dtype)
+
+        with pytest.raises(ValueError):
+            resolve_dtype_iter(())
+
     #---------------------------------------------------------------------------
 
     def test_shape_filter_a(self) -> None:
@@ -134,6 +143,11 @@ def test_shape_filter_a(self) -> None:
         with self.assertRaises(NotImplementedError):
             shape_filter(a1.reshape(1,2,5))
 
+        with self.assertRaises(NotImplementedError):
+            # zero dimension
+            shape_filter(np.array(1))
+
+        
     #---------------------------------------------------------------------------
 
     def test_column_2d_filter_a(self) -> None: