diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-31 18:22:25 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-31 18:22:25 (GMT) |
| commit | 591c9214110d1004032c61b00e47ad0805947ef2 (patch) | |
| tree | 9cb24f2056e26740b5332fb8d696e8580ece550b /Objects | |
| parent | 67f7a5ad797e261f23cbdd43e13c57b0f5bec12b (diff) | |
| parent | 9892f52145a72729253c0e71790feef49d7892af (diff) | |
| download | cpython-591c9214110d1004032c61b00e47ad0805947ef2.zip cpython-591c9214110d1004032c61b00e47ad0805947ef2.tar.gz cpython-591c9214110d1004032c61b00e47ad0805947ef2.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Objects')
| -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; |