Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-46161: Fix bug in starunpack_helper in compile.c (GH-30235)

This commit is contained in:
zq1997 2022-01-18 01:45:44 +08:00 committed by GitHub
parent 62a6594e66
commit c118c2455c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/test/test_class.py
View File

@ -666,5 +666,23 @@ class ClassTests(unittest.TestCase):
with self.assertRaisesRegex(TypeError, error_msg):
object.__init__(E(), 42)
def testClassWithExtCall(self):
class Meta(int):
def __init__(*args, **kwargs):
pass
def __new__(cls, name, bases, attrs, **kwargs):
return bases, kwargs
d = {'metaclass': Meta}
class A(**d): pass
self.assertEqual(A, ((), {}))
class A(0, 1, 2, 3, 4, 5, 6, 7, **d): pass
self.assertEqual(A, (tuple(range(8)), {}))
class A(0, *range(1, 8), **d, foo='bar'): pass
self.assertEqual(A, (tuple(range(8)), {'foo': 'bar'}))
if __name__ == '__main__':
unittest.main()

1
Misc/NEWS.d/next/Core and Builtins/2021-12-23-12-32-45.bpo-46161.EljBmu.rst Normal file
View File

@ -0,0 +1 @@
Fix the class building error when the arguments are constants and CALL_FUNCTION_EX is used.

5
Python/compile.c
View File

@ -4233,7 +4233,7 @@ starunpack_helper(struct compiler *c, asdl_expr_seq *elts, int pushed,
Py_INCREF(val);
PyTuple_SET_ITEM(folded, i, val);
}
if (tuple) {
if (tuple && !pushed) {
ADDOP_LOAD_CONST_NEW(c, folded);
} else {
if (add == SET_ADD) {
@ -4245,6 +4245,9 @@ starunpack_helper(struct compiler *c, asdl_expr_seq *elts, int pushed,
ADDOP_I(c, build, pushed);
ADDOP_LOAD_CONST_NEW(c, folded);
ADDOP_I(c, extend, 1);
if (tuple) {
ADDOP(c, LIST_TO_TUPLE);
}
}
return 1;
}