diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-31 18:22:31 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-31 18:22:31 (GMT) |
| commit | 8781d4a84c778bcb1b11e11877949f06ea4fcf3e (patch) | |
| tree | 888e0d6f7a2d5c0092f866e233dc8e11f41ca3aa | |
| parent | 9b80c675899cdd9ce3c8e8f215b10fd263e42480 (diff) | |
| parent | 591c9214110d1004032c61b00e47ad0805947ef2 (diff) | |
| download | cpython-8781d4a84c778bcb1b11e11877949f06ea4fcf3e.zip cpython-8781d4a84c778bcb1b11e11877949f06ea4fcf3e.tar.gz cpython-8781d4a84c778bcb1b11e11877949f06ea4fcf3e.tar.bz2 | |
merge 3.3
| -rw-r--r-- | Objects/dictobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 02dcf7b..f4ad3dc 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1707,7 +1707,7 @@ dict_fromkeys(PyObject *cls, PyObject *args) if (d == NULL) return NULL; - if (PyDict_CheckExact(d) && PyDict_Size(d) == 0) { + if (PyDict_CheckExact(d) && ((PyDictObject *)d)->ma_used == 0) { if (PyDict_CheckExact(seq)) { PyDictObject *mp = (PyDictObject *)d; PyObject *oldvalue; |