From: Phillip J. Eby <pje@telecommunity.com>
Date: Thu, 25 Mar 2004 02:36:29 +0000 (+0000)
Subject: Ensure super() lookup of descriptor from classmethod works (SF ID# 743627)
X-Git-Tag: v2.3.4c1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f12b642f1cfed86691ff660d1cded609706aa708;p=thirdparty%2FPython%2Fcpython.git

Ensure super() lookup of descriptor from classmethod works (SF ID# 743627)
(Backport to 2.3 maintenance branch)
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index b3336d1fc8d7..2907d04dea4e 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -2064,6 +2064,20 @@ def supers():
     vereq(dd.x, "hello")
     vereq(super(DDsub, dd).x, 42)
 
+    # Ensure that super() lookup of descriptor from classmethod
+    # works (SF ID# 743627)
+
+    class Base(object):
+        aProp = property(lambda self: "foo")
+
+    class Sub(Base):
+        def test(klass):
+            return super(Sub,klass).aProp
+        test = classmethod(test)
+
+    veris(Sub.test(), Base.aProp)
+
+
 def inherits():
     if verbose: print "Testing inheritance from basic types..."
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 149d2d0d8f35..81c2baee7017 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5496,7 +5496,14 @@ super_getattro(PyObject *self, PyObject *name)
 				Py_INCREF(res);
 				f = res->ob_type->tp_descr_get;
 				if (f != NULL) {
-					tmp = f(res, su->obj,
+					tmp = f(res,
+						/* Only pass 'obj' param if
+						   this is instance-mode super 
+						   (See SF ID #743627)
+						*/
+						(su->obj==su->obj_type 
+							? (PyObject *)NULL 
+							: su->obj),
 						(PyObject *)starttype);
 					Py_DECREF(res);
 					res = tmp;