https://github.com/python/cpython/commit/13d7cf997bc9c22cf67c42fd799413e8325e0039
commit: 13d7cf997bc9c22cf67c42fd799413e8325e0039
branch: main
author: Jelle Zijlstra <[email protected]>
committer: JelleZijlstra <[email protected]>
date: 2024-05-10T08:42:00-07:00
summary:
gh-118895: Call PyType_Ready() on typing.NoDefault (#118897)
files:
A Misc/NEWS.d/next/Library/2024-05-10-05-24-32.gh-issue-118895.wUm5r2.rst
M Include/internal/pycore_typevarobject.h
M Lib/test/test_typing.py
M Modules/_typingmodule.c
diff --git a/Include/internal/pycore_typevarobject.h
b/Include/internal/pycore_typevarobject.h
index 80a2daf4efc16a..a368edebd622a1 100644
--- a/Include/internal/pycore_typevarobject.h
+++ b/Include/internal/pycore_typevarobject.h
@@ -18,6 +18,7 @@ extern int _Py_initialize_generic(PyInterpreterState *);
extern void _Py_clear_generic_types(PyInterpreterState *);
extern PyTypeObject _PyTypeAlias_Type;
+extern PyTypeObject _PyNoDefault_Type;
extern PyObject _Py_NoDefaultStruct;
#ifdef __cplusplus
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 8dde8aedd2a2b1..81fea41e9b9823 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -45,7 +45,7 @@
import weakref
import types
-from test.support import captured_stderr, cpython_only, infinite_recursion
+from test.support import captured_stderr, cpython_only, infinite_recursion,
requires_docstrings
from test.typinganndata import ann_module695, mod_generics_cache,
_typed_dict_helper
@@ -10236,15 +10236,34 @@ def test_pickling(self):
def test_constructor(self):
self.assertIs(NoDefault, type(NoDefault)())
with self.assertRaises(TypeError):
- NoDefault(1)
+ type(NoDefault)(1)
def test_repr(self):
self.assertEqual(repr(NoDefault), 'typing.NoDefault')
+ @requires_docstrings
+ def test_doc(self):
+ self.assertIsInstance(NoDefault.__doc__, str)
+
+ def test_class(self):
+ self.assertIs(NoDefault.__class__, type(NoDefault))
+
def test_no_call(self):
with self.assertRaises(TypeError):
NoDefault()
+ def test_no_attributes(self):
+ with self.assertRaises(AttributeError):
+ NoDefault.foo = 3
+ with self.assertRaises(AttributeError):
+ NoDefault.foo
+
+ # TypeError is consistent with the behavior of NoneType
+ with self.assertRaises(TypeError):
+ type(NoDefault).foo = 3
+ with self.assertRaises(AttributeError):
+ type(NoDefault).foo
+
class AllTests(BaseTestCase):
"""Tests for __all__."""
diff --git
a/Misc/NEWS.d/next/Library/2024-05-10-05-24-32.gh-issue-118895.wUm5r2.rst
b/Misc/NEWS.d/next/Library/2024-05-10-05-24-32.gh-issue-118895.wUm5r2.rst
new file mode 100644
index 00000000000000..226c8d612a039c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-05-10-05-24-32.gh-issue-118895.wUm5r2.rst
@@ -0,0 +1,2 @@
+Setting attributes on :data:`typing.NoDefault` now raises
+:exc:`AttributeError` instead of :exc:`TypeError`.
diff --git a/Modules/_typingmodule.c b/Modules/_typingmodule.c
index 09fbb3c5e8b91d..37af00f3071e1d 100644
--- a/Modules/_typingmodule.c
+++ b/Modules/_typingmodule.c
@@ -63,6 +63,9 @@ _typing_exec(PyObject *m)
if (PyModule_AddObjectRef(m, "TypeAliasType", (PyObject
*)&_PyTypeAlias_Type) < 0) {
return -1;
}
+ if (PyType_Ready(&_PyNoDefault_Type) < 0) {
+ return -1;
+ }
if (PyModule_AddObjectRef(m, "NoDefault", (PyObject
*)&_Py_NoDefaultStruct) < 0) {
return -1;
}
_______________________________________________
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]
