https://github.com/python/cpython/commit/5bd2ea2b94074d1a57ab24ef66a201817b2c1b91
commit: 5bd2ea2b94074d1a57ab24ef66a201817b2c1b91
branch: 3.12
author: Eric Snow <[email protected]>
committer: ericsnowcurrently <[email protected]>
date: 2024-07-29T10:25:17-06:00
summary:
[3.12] gh-117482: Fix the Slot Wrapper Inheritance Tests (gh-122250)
The tests were only checking cases where the slot wrapper was present in the
initial case. They were missing when the slot wrapper was added in the
additional initializations. This fixes that.
(cherry-picked from commit 490e0ad83ac72c5688dfbbab4eac61ccfd7be5fd, AKA
gh-122248)
files:
M Lib/test/support/__init__.py
M Lib/test/test_embed.py
M Lib/test/test_types.py
M Objects/typeobject.c
M Programs/_testembed.c
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 585affcd3855d6..c2ef9f46c2ff96 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2413,3 +2413,58 @@ def copy_python_src_ignore(path, names):
'build',
}
return ignored
+
+
+def iter_builtin_types():
+ for obj in __builtins__.values():
+ if not isinstance(obj, type):
+ continue
+ cls = obj
+ if cls.__module__ != 'builtins':
+ continue
+ yield cls
+
+
+def iter_slot_wrappers(cls):
+ assert cls.__module__ == 'builtins', cls
+
+ def is_slot_wrapper(name, value):
+ if not isinstance(value, types.WrapperDescriptorType):
+ assert not repr(value).startswith('<slot wrapper '), (cls, name,
value)
+ return False
+ assert repr(value).startswith('<slot wrapper '), (cls, name, value)
+ assert callable(value), (cls, name, value)
+ assert name.startswith('__') and name.endswith('__'), (cls, name,
value)
+ return True
+
+ ns = vars(cls)
+ unused = set(ns)
+ for name in dir(cls):
+ if name in ns:
+ unused.remove(name)
+
+ try:
+ value = getattr(cls, name)
+ except AttributeError:
+ # It's as though it weren't in __dir__.
+ assert name in ('__annotate__', '__annotations__',
'__abstractmethods__'), (cls, name)
+ if name in ns and is_slot_wrapper(name, ns[name]):
+ unused.add(name)
+ continue
+
+ if not name.startswith('__') or not name.endswith('__'):
+ assert not is_slot_wrapper(name, value), (cls, name, value)
+ if not is_slot_wrapper(name, value):
+ if name in ns:
+ assert not is_slot_wrapper(name, ns[name]), (cls, name, value,
ns[name])
+ else:
+ if name in ns:
+ assert ns[name] is value, (cls, name, value, ns[name])
+ yield name, True
+ else:
+ yield name, False
+
+ for name in unused:
+ value = ns[name]
+ if is_slot_wrapper(cls, name, value):
+ yield name, True
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index de705abbc5cdd9..bb798ca8a9a22c 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -391,29 +391,47 @@ def test_ucnhash_capi_reset(self):
self.assertEqual(out, '9\n' * INIT_LOOPS)
def test_static_types_inherited_slots(self):
- slots = []
- script = ['import sys']
- from test.test_types import iter_builtin_types, iter_own_slot_wrappers
- for cls in iter_builtin_types():
- for slot in iter_own_slot_wrappers(cls):
- slots.append((cls, slot))
- attr = f'{cls.__name__}.{slot}'
- script.append(f'print("{attr}:", {attr}, file=sys.stderr)')
- script.append('')
- script = os.linesep.join(script)
-
- with contextlib.redirect_stderr(io.StringIO()) as stderr:
- exec(script)
- expected = stderr.getvalue().splitlines()
-
- out, err = self.run_embedded_interpreter("test_repeated_init_exec",
script)
+ script = textwrap.dedent("""
+ import test.support
+
+ results = {}
+ def add(cls, slot, own):
+ value = getattr(cls, slot)
+ try:
+ subresults = results[cls.__name__]
+ except KeyError:
+ subresults = results[cls.__name__] = {}
+ subresults[slot] = [repr(value), own]
+
+ for cls in test.support.iter_builtin_types():
+ for slot, own in test.support.iter_slot_wrappers(cls):
+ add(cls, slot, own)
+ """)
+
+ ns = {}
+ exec(script, ns, ns)
+ all_expected = ns['results']
+ del ns
+
+ script += textwrap.dedent("""
+ import json
+ import sys
+ text = json.dumps(results)
+ print(text, file=sys.stderr)
+ """)
+ out, err = self.run_embedded_interpreter(
+ "test_repeated_init_exec", script, script)
results = err.split('--- Loop #')[1:]
results = [res.rpartition(' ---\n')[-1] for res in results]
self.maxDiff = None
- for i, result in enumerate(results, start=1):
- with self.subTest(loop=i):
- self.assertEqual(result.splitlines(), expected)
+ for i, text in enumerate(results, start=1):
+ result = json.loads(text)
+ for classname, expected in all_expected.items():
+ with self.subTest(loop=i, cls=classname):
+ slots = result.pop(classname)
+ self.assertEqual(slots, expected)
+ self.assertEqual(result, {})
self.assertEqual(out, '')
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index c3d08e5b13682e..43949770b16637 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1,6 +1,9 @@
# Python test set -- part 6, built-in types
-from test.support import run_with_locale, cpython_only, MISSING_C_DOCSTRINGS
+from test.support import (
+ run_with_locale, cpython_only, iter_builtin_types, iter_slot_wrappers,
+ MISSING_C_DOCSTRINGS,
+)
from test.test_import import no_rerun
import collections.abc
from collections import namedtuple
@@ -29,26 +32,6 @@ def clear_typing_caches():
f()
-def iter_builtin_types():
- for obj in __builtins__.values():
- if not isinstance(obj, type):
- continue
- cls = obj
- if cls.__module__ != 'builtins':
- continue
- yield cls
-
-
-@cpython_only
-def iter_own_slot_wrappers(cls):
- for name, value in vars(cls).items():
- if not name.startswith('__') or not name.endswith('__'):
- continue
- if 'slot wrapper' not in str(value):
- continue
- yield name
-
-
class TypesTests(unittest.TestCase):
def test_truth_values(self):
@@ -2286,14 +2269,14 @@ def setUpClass(cls):
@cpython_only
@no_rerun('channels (and queues) might have a refleak; see gh-122199')
- def test_slot_wrappers(self):
+ def test_static_types_inherited_slots(self):
rch, sch = interpreters.create_channel()
slots = []
script = ''
for cls in iter_builtin_types():
- for slot in iter_own_slot_wrappers(cls):
- slots.append((cls, slot))
+ for slot, own in iter_slot_wrappers(cls):
+ slots.append((cls, slot, own))
attr = f'{cls.__name__}.{slot}'
script += textwrap.dedent(f"""
sch.send_nowait('{attr}: ' + repr({attr}))
@@ -2301,7 +2284,7 @@ def test_slot_wrappers(self):
exec(script)
all_expected = []
- for cls, slot in slots:
+ for cls, slot, _ in slots:
result = rch.recv()
assert result.startswith(f'{cls.__name__}.{slot}: '), (cls, slot,
result)
all_expected.append(result)
@@ -2313,7 +2296,7 @@ def test_slot_wrappers(self):
"""))
interp.run(script)
- for i, _ in enumerate(slots):
+ for i, (cls, slot, _) in enumerate(slots):
with self.subTest(cls=cls, slot=slot):
expected = all_expected[i]
result = rch.recv()
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 2489d502ae7899..e8ec98bad980aa 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -10094,7 +10094,25 @@ expect_manually_inherited(PyTypeObject *type, void
**slot)
&& typeobj != PyExc_StopIteration
&& typeobj != PyExc_SyntaxError
&& typeobj != PyExc_UnicodeDecodeError
- && typeobj != PyExc_UnicodeEncodeError)
+ && typeobj != PyExc_UnicodeEncodeError
+
+ && type != &PyBool_Type
+ && type != &PyBytes_Type
+ && type != &PyMemoryView_Type
+ && type != &PyComplex_Type
+ && type != &PyEnum_Type
+ && type != &PyFilter_Type
+ && type != &PyFloat_Type
+ && type != &PyFrozenSet_Type
+ && type != &PyLong_Type
+ && type != &PyMap_Type
+ && type != &PyRange_Type
+ && type != &PyReversed_Type
+ && type != &PySlice_Type
+ && type != &PyTuple_Type
+ && type != &PyUnicode_Type
+ && type != &PyZip_Type)
+
{
return 1;
}
@@ -10112,10 +10130,8 @@ expect_manually_inherited(PyTypeObject *type, void
**slot)
/* This is a best-effort list of builtin types
that have their own tp_getattr function. */
if (typeobj == PyExc_BaseException
- || type == &PyBool_Type
|| type == &PyByteArray_Type
|| type == &PyBytes_Type
- || type == &PyClassMethod_Type
|| type == &PyComplex_Type
|| type == &PyDict_Type
|| type == &PyEnum_Type
@@ -10129,7 +10145,6 @@ expect_manually_inherited(PyTypeObject *type, void
**slot)
|| type == &PyReversed_Type
|| type == &PySet_Type
|| type == &PySlice_Type
- || type == &PyStaticMethod_Type
|| type == &PySuper_Type
|| type == &PyTuple_Type
|| type == &PyZip_Type)
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index f78ba41fe7b4eb..1386153ad12da1 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -163,15 +163,23 @@ PyInit_embedded_ext(void)
static int test_repeated_init_exec(void)
{
if (main_argc < 3) {
- fprintf(stderr, "usage: %s test_repeated_init_exec CODE\n", PROGRAM);
+ fprintf(stderr,
+ "usage: %s test_repeated_init_exec CODE ...\n", PROGRAM);
exit(1);
}
const char *code = main_argv[2];
+ int loops = main_argc > 3
+ ? main_argc - 2
+ : INIT_LOOPS;
- for (int i=1; i <= INIT_LOOPS; i++) {
- fprintf(stderr, "--- Loop #%d ---\n", i);
+ for (int i=0; i < loops; i++) {
+ fprintf(stderr, "--- Loop #%d ---\n", i+1);
fflush(stderr);
+ if (main_argc > 3) {
+ code = main_argv[i+2];
+ }
+
_testembed_Py_InitializeFromConfig();
int err = PyRun_SimpleString(code);
Py_Finalize();
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
