[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/1698d1ab0b0a
changeset:   80121:1698d1ab0b0a
parent:      80116:a647e498e73a
parent:      80120:4b842da2b0ac
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 14:22:31 2012 -0400
summary:
  merge 3.3

files:
  Objects/dictobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/dictobject.c b/Objects/dictobject.c
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1707,7 +1707,7 @@
     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;

-- 
Repository URL: http://hg.python.org/cpython