From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 20 Jul 2012 11:52:54 +0000 (+0300)
Subject: Merge 3.2
X-Git-Tag: v3.3.0b2~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0364764fdaca63881dc78d8625e05d9880fc440;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

a0364764fdaca63881dc78d8625e05d9880fc440
diff --cc Objects/classobject.c
index 0416a6a7330a,b7d35ef8852e..c481dd3e9c63
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@@ -242,10 -241,12 +242,12 @@@ method_repr(PyMethodObject *a
      if (klass == NULL)
          klassname = NULL;
      else {
 -        klassname = PyObject_GetAttrString(klass, "__name__");
 +        klassname = _PyObject_GetAttrId(klass, &PyId___name__);
          if (klassname == NULL) {
-             if (!PyErr_ExceptionMatches(PyExc_AttributeError))
+             if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+                 Py_XDECREF(funcname);
                  return NULL;
+             }
              PyErr_Clear();
          }
          else if (!PyUnicode_Check(klassname)) {