traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Benjamin Peterson 2012-04-24 14:44:18 -04:00
parent 17feca0efc
commit 15ee821eb5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_dict.py
View File

@ -889,6 +889,13 @@ class DictTest(unittest.TestCase):
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):

11
Objects/dictobject.c
View File

@ -966,6 +966,8 @@ 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)
{
@ -973,7 +975,8 @@ make_keys_shared(PyObject *op)
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 {