Merge branch 'master' into 97/dta-cleanup

Author: flexatone

src/_arraykit.c

@@ -162,7 +162,7 @@ AK_ResolveDTypeIter(PyObject *dtypes)
     return resolved;
 }
 
-// Perform a deepcopy on an array, using an optional memo dictionary, and specialized to depend on immutable arrays. This depends on the module object to get the deepcopy method.
+// Perform a deepcopy on an array, using an optional memo dictionary, and specialized to depend on immutable arrays. This depends on the module object to get the deepcopy method. The `memo` object can be None.
 PyObject*
 AK_ArrayDeepCopy(PyObject* m, PyArrayObject *array, PyObject *memo)
 {
@@ -186,6 +186,7 @@ AK_ArrayDeepCopy(PyObject* m, PyArrayObject *array, PyObject *memo)
     PyArray_Descr *dtype = PyArray_DESCR(array); // borrowed ref
 
     if (PyDataType_ISOBJECT(dtype)) {
+        // we store the deepcopy function on this module for faster lookup here
         PyObject *deepcopy = PyObject_GetAttrString(m, "deepcopy");
         if (!deepcopy) {
             goto error;
@@ -3310,11 +3311,20 @@ array_deepcopy(PyObject *m, PyObject *args, PyObject *kwargs)
     PyObject *array;
     PyObject *memo = NULL;
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-            "O|O!:array_deepcopy", array_deepcopy_kwarg_names,
+            "O|O:array_deepcopy", array_deepcopy_kwarg_names,
             &array,
-            &PyDict_Type, &memo)) {
+            &memo)) {
         return NULL;
     }
+    if ((memo == NULL) || (memo == Py_None)) {
+        memo = NULL;
+    }
+    else {
+        if (!PyDict_Check(memo)) {
+            PyErr_SetString(PyExc_TypeError, "memo must be a dict or None");
+            return NULL;
+        }
+    }
     AK_CHECK_NUMPY_ARRAY(array);
     return AK_ArrayDeepCopy(m, (PyArrayObject*)array, memo);
 }

test/test_util.py

@@ -268,14 +268,25 @@ def test_array_deepcopy_d(self) -> None:
     def test_array_deepcopy_e(self) -> None:
         a1 = np.array((3, 4, 5))
         with self.assertRaises(TypeError):
-            # memo argument must be a dictionary
-            a2 = array_deepcopy(a1, memo=None)
+            a2 = array_deepcopy(a1, memo='')
 
     def test_array_deepcopy_f(self) -> None:
         a1 = np.array((3, 4, 5))
         a2 = array_deepcopy(a1)
         self.assertNotEqual(id(a1), id(a2))
 
+    def test_array_deepcopy_g(self) -> None:
+        a1 = np.arange(10)
+        a2 = array_deepcopy(a1, None)
+        self.assertNotEqual(mloc(a1), mloc(a2))
+
+    def test_array_deepcopy_h(self) -> None:
+        a1 = np.arange(10)
+        with self.assertRaises(TypeError):
+            a2 = array_deepcopy(a1, ())
+
+    #---------------------------------------------------------------------------
+
     def test_isna_element_a(self) -> None:
         class FloatSubclass(float): pass
         class ComplexSubclass(complex): pass