[Python-checkins] [3.12] gh-106917: fix super classmethod calls to non-classmethods (GH-106977). (#107204)
carljm
webhook-mailer at python.org
Mon Jul 24 17:13:21 EDT 2023
https://github.com/python/cpython/commit/5fd028b677ae1dd20a60fc2f43d4380b809d70f0
commit: 5fd028b677ae1dd20a60fc2f43d4380b809d70f0
branch: 3.12
author: Carl Meyer <carl at oddbird.net>
committer: carljm <carl at oddbird.net>
date: 2023-07-24T21:13:17Z
summary:
[3.12] gh-106917: fix super classmethod calls to non-classmethods (GH-106977). (#107204)
(cherry picked from commit e5d5522612e03af3941db1d270bf6caebf330b8a)
files:
A Misc/NEWS.d/next/Core and Builtins/2023-07-21-14-37-48.gh-issue-106917.1jWp_m.rst
M Lib/test/test_super.py
M Python/bytecodes.c
M Python/generated_cases.c.h
diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
index 664cf70b3cf0f..43162c540b55a 100644
--- a/Lib/test/test_super.py
+++ b/Lib/test/test_super.py
@@ -5,6 +5,9 @@
from test import shadowed_super
+ADAPTIVE_WARMUP_DELAY = 2
+
+
class A:
def f(self):
return 'A'
@@ -419,8 +422,47 @@ def test(name):
super(MyType, type(mytype)).__setattr__(mytype, "bar", 1)
self.assertEqual(mytype.bar, 1)
- test("foo1")
- test("foo2")
+ for _ in range(ADAPTIVE_WARMUP_DELAY):
+ test("foo1")
+
+ def test_reassigned_new(self):
+ class A:
+ def __new__(cls):
+ pass
+
+ def __init_subclass__(cls):
+ if "__new__" not in cls.__dict__:
+ cls.__new__ = cls.__new__
+
+ class B(A):
+ pass
+
+ class C(B):
+ def __new__(cls):
+ return super().__new__(cls)
+
+ for _ in range(ADAPTIVE_WARMUP_DELAY):
+ C()
+
+ def test_mixed_staticmethod_hierarchy(self):
+ # This test is just a desugared version of `test_reassigned_new`
+ class A:
+ @staticmethod
+ def some(cls, *args, **kwargs):
+ self.assertFalse(args)
+ self.assertFalse(kwargs)
+
+ class B(A):
+ def some(cls, *args, **kwargs):
+ return super().some(cls, *args, **kwargs)
+
+ class C(B):
+ @staticmethod
+ def some(cls):
+ return super().some(cls)
+
+ for _ in range(ADAPTIVE_WARMUP_DELAY):
+ C.some(C)
if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-07-21-14-37-48.gh-issue-106917.1jWp_m.rst b/Misc/NEWS.d/next/Core and Builtins/2023-07-21-14-37-48.gh-issue-106917.1jWp_m.rst
new file mode 100644
index 0000000000000..82c74d5465458
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-07-21-14-37-48.gh-issue-106917.1jWp_m.rst
@@ -0,0 +1,4 @@
+Fix classmethod-style :func:`super` method calls (i.e., where the second
+argument to :func:`super`, or the implied second argument drawn from
+``self/cls`` in the case of zero-arg super, is a type) when the target of
+the call is not a classmethod.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 0baf2451ee4f8..b914afa07fba4 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1663,7 +1663,7 @@ dummy_func(
PyTypeObject *cls = (PyTypeObject *)class;
int method_found = 0;
res2 = _PySuper_Lookup(cls, self, name,
- cls->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
+ Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
Py_DECREF(global_super);
Py_DECREF(class);
if (res2 == NULL) {
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 103373ec0db01..281c8b5e5245b 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2411,7 +2411,7 @@
PyTypeObject *cls = (PyTypeObject *)class;
int method_found = 0;
res2 = _PySuper_Lookup(cls, self, name,
- cls->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
+ Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
Py_DECREF(global_super);
Py_DECREF(class);
if (res2 == NULL) {
More information about the Python-checkins
mailing list