diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-03-04 14:48:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-03-04 14:48:30 (GMT) |
| commit | 42f382facd09e4ae9e2a3a082c35bd7e3ce33931 (patch) | |
| tree | 812e9bf1bfacf83ce537b278f3a75dd380a7aae7 /Objects/dictobject.c | |
| parent | 63f40d7af442e8d1fbb50ca0f8c5faf815f5ccbb (diff) | |
| parent | b1efa53662385ba64289d9fe6fb8ca5b431c4119 (diff) | |
| download | cpython-42f382facd09e4ae9e2a3a082c35bd7e3ce33931.zip cpython-42f382facd09e4ae9e2a3a082c35bd7e3ce33931.tar.gz cpython-42f382facd09e4ae9e2a3a082c35bd7e3ce33931.tar.bz2 | |
merge 3.3 (#17328)
Diffstat (limited to 'Objects/dictobject.c')
| -rw-r--r-- | Objects/dictobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index a3c6409..9080ddf 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2235,14 +2235,14 @@ dict_setdefault(register PyDictObject *mp, PyObject *args) return NULL; val = *value_addr; if (val == NULL) { - Py_INCREF(failobj); - Py_INCREF(key); if (mp->ma_keys->dk_usable <= 0) { /* Need to resize. */ if (insertion_resize(mp) < 0) return NULL; ep = find_empty_slot(mp, key, hash, &value_addr); } + Py_INCREF(failobj); + Py_INCREF(key); MAINTAIN_TRACKING(mp, key, failobj); ep->me_key = key; ep->me_hash = hash; |