classobject.c:instancemethod_descr_get(): when a bound method is

assigned to a class variable and then accessed via an instance, it
should not be rebound.

test_descr.py:methods(): test for the condition above.

1 files changed, 5 insertions, 0 deletions

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 255a432..82eb1d5 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -2196,6 +2196,11 @@ instancemethod_call(PyObject *func, PyObject *arg, PyObject *kw)
 static PyObject *
 instancemethod_descr_get(PyObject *meth, PyObject *obj, PyObject *type)
 {
+	if (PyMethod_GET_SELF(meth) != NULL) {
+		/* Don't rebind an already bound method */
+		Py_INCREF(meth);
+		return meth;
+	}
 	if (obj == Py_None)
 		obj = NULL;
 	return PyMethod_New(PyMethod_GET_FUNCTION(meth), obj, type);