merge 3.2

benjaminp · benjaminp · commit 3a37b8393c9e · 2012-06-01T23:57:50.000-07:00
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -163,10 +163,8 @@ builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds)
             cls = PyEval_CallObjectWithKeywords(meta, margs, mkw);
             Py_DECREF(margs);
         }
-        if (cls != NULL && PyCell_Check(cell)) {
-            Py_INCREF(cls);
-            PyCell_SET(cell, cls);
-        }
+        if (cls != NULL && PyCell_Check(cell))
+            PyCell_Set(cell, cls);
         Py_DECREF(cell);
     }
     Py_DECREF(ns);

Original file line number	Diff line number	Diff line change
`@@ -163,10 +163,8 @@ builtin___build_class__(PyObject self, PyObject args, PyObject *kwds)`
`163`	`163`	`cls = PyEval_CallObjectWithKeywords(meta, margs, mkw);`
`164`	`164`	`Py_DECREF(margs);`
`165`	`165`	`}`
`166`		`- if (cls != NULL && PyCell_Check(cell)) {`
`167`		`- Py_INCREF(cls);`
`168`		`- PyCell_SET(cell, cls);`
`169`		`- }`
	`166`	`+ if (cls != NULL && PyCell_Check(cell))`
	`167`	`+ PyCell_Set(cell, cls);`
`170`	`168`	`Py_DECREF(cell);`
`171`	`169`	`}`
`172`	`170`	`Py_DECREF(ns);`