distiguish between refusing to creating shared keys and error (#13903)

benjaminp · benjaminp · commit 15ee821eb50b · 2012-04-24T14:44:18.000-04:00
diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
@@ -889,6 +889,13 @@ class _str(str):
         self.assertEqual(f.msg, getattr(f, _str('msg')))
         self.assertEqual(f.msg, f.__dict__[_str('msg')])
 
+    def test_object_set_item_single_instance_non_str_key(self):
+        class Foo: pass
+        f = Foo()
+        f.__dict__[1] = 1
+        f.a = 'a'
+        self.assertEqual(f.__dict__, {1:1, 'a':'a'})
+
 from test import mapping_tests
 
 class GeneralMappingTests(mapping_tests.BasicTestMappingProtocol):
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -966,14 +966,17 @@ dictresize(PyDictObject *mp, Py_ssize_t minused)
     return 0;
 }
 
+/* Returns NULL if unable to split table.
+ * A NULL return does not necessarily indicate an error */
 static PyDictKeysObject *
 make_keys_shared(PyObject *op)
 {
     Py_ssize_t i;
     Py_ssize_t size;
     PyDictObject *mp = (PyDictObject *)op;
 
-    assert(PyDict_CheckExact(op));
+    if (!PyDict_CheckExact(op))
+        return NULL;
     if (!_PyDict_HasSplitTable(mp)) {
         PyDictKeyEntry *ep0;
         PyObject **values;
@@ -3694,14 +3697,14 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr,
             res = PyDict_SetItem(dict, key, value);
             if (cached != ((PyDictObject *)dict)->ma_keys) {
                 /* Either update tp->ht_cached_keys or delete it */
-                if (cached->dk_refcnt == 1 && PyDict_CheckExact(dict)) {
+                if (cached->dk_refcnt == 1) {
                     CACHED_KEYS(tp) = make_keys_shared(dict);
-                    if (CACHED_KEYS(tp) == NULL)
-                        return -1;
                 } else {
                     CACHED_KEYS(tp) = NULL;
                 }
                 DK_DECREF(cached);
+                if (CACHED_KEYS(tp) == NULL && PyErr_Occurred())
+                    return -1;
             }
         }
     } else {
