Issue 6637: defaultdict.copy() failed with an empty factory.

diff --git a/Lib/test/test_defaultdict.py b/Lib/test/test_defaultdict.py
index 00bd9dc516e19518047a3f5117d40fd76ec64f0d..76fc6a6e3366b141985f710f8c958a1baa7f7056 100644 (file)
--- a/Lib/test/test_defaultdict.py
+++ b/Lib/test/test_defaultdict.py
@@ -60,6 +60,7 @@ class TestDefaultDict(unittest.TestCase):
         d1 = defaultdict()
         self.assertEqual(d1.default_factory, None)
         self.assertEqual(repr(d1), "defaultdict(None, {})")
+        self.assertEqual(eval(repr(d1)), d1)
         d1[11] = 41
         self.assertEqual(repr(d1), "defaultdict(None, {11: 41})")
         d2 = defaultdict(int)
@@ -112,6 +113,12 @@ class TestDefaultDict(unittest.TestCase):
         d4[12]
         self.assertEqual(d4, {42: [], 12: []})
 
+        # Issue 6637: Copy fails for empty default dict
+        d = defaultdict()
+        d['a'] = 42
+        e = d.copy()
+        self.assertEqual(e['a'], 42)
+
     def test_shallow_copy(self):
         d1 = defaultdict(foobar, {1: 1})
         d2 = copy.copy(d1)

diff --git a/Misc/NEWS b/Misc/NEWS
index 7c66a66d84dcd5e9114f33fb7daacc980e22d74f..f7c1302c48de844d9644421619282cd4b084b0e2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,10 @@ C-API
 Library
 -------
 
+- Issue #6637: defaultdict.copy() did not work when the default factory
+  was left unspecified.  Also, the eval/repr round-trip would fail when
+  the default_factory was None.
+
 - Issue #2715: Remove remnants of Carbon.File from binhex module.
 
 - Issue #6595: The Decimal constructor now allows arbitrary Unicode

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index f8d656cccbfa58328760b04349279f8f3ef9b379..68e01836cb8764f15ddea5e3d6926a58b1c17272 100644 (file)
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1170,6 +1170,9 @@ defdict_copy(defdictobject *dd)
           whose class constructor has the same signature.  Subclasses that
           define a different constructor signature must override copy().
        */
+
+       if (dd->default_factory == NULL)
+               return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL);
        return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd),
                                            dd->default_factory, dd, NULL);
 }
@@ -1316,7 +1319,7 @@ defdict_init(PyObject *self, PyObject *args, PyObject *kwds)
                Py_ssize_t n = PyTuple_GET_SIZE(args);
                if (n > 0) {
                        newdefault = PyTuple_GET_ITEM(args, 0);
-                       if (!PyCallable_Check(newdefault)) {
+                       if (!PyCallable_Check(newdefault) && newdefault != Py_None) {
                                PyErr_SetString(PyExc_TypeError,
                                        "first argument must be callable");                           
                                return -1;