merge 3.3

8781d4a8 · Benjamin Peterson · 9b80c675 · 591c9214 · 8781d4a8
Commit 8781d4a8 authored Oct 31, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Objects/dictobject.c Objects/dictobject.c +1 -1

No files found.
--- 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;