https://github.com/python/cpython/commit/231a50fa9a5444836c94cda50a56ecf080c7d3b0
commit: 231a50fa9a5444836c94cda50a56ecf080c7d3b0
branch: main
author: Adam Turner <9087854+aa-tur...@users.noreply.github.com>
committer: AA-Turner <9087854+aa-tur...@users.noreply.github.com>
date: 2025-04-04T23:37:41+01:00
summary:
gh-109599: Expose `CapsuleType` via the `_types` module (#131969)
files:
A Modules/_typesmodule.c
M Lib/types.py
M Modules/Setup
M Modules/Setup.bootstrap.in
M PC/config.c
M PCbuild/pythoncore.vcxproj
M PCbuild/pythoncore.vcxproj.filters
M Python/stdlib_module_names.h
M configure
M configure.ac
diff --git a/Lib/types.py b/Lib/types.py
index 1484c22ee9dffa..9aa0a3b087c1c7 100644
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -2,7 +2,7 @@
Define names for built-in types that aren't directly accessible as a builtin.
"""
-import sys
+import _types
# Iterators in Python aren't a matter of type but of protocol. A large
# and changing number of builtin types implement *some* flavor of
@@ -14,7 +14,7 @@ def _f(): pass
LambdaType = type(lambda: None) # Same as FunctionType
CodeType = type(_f.__code__)
MappingProxyType = type(type.__dict__)
-SimpleNamespace = type(sys.implementation)
+SimpleNamespace = _types.SimpleNamespace
def _cell_factory():
a = 1
@@ -49,7 +49,7 @@ def _m(self): pass
MethodDescriptorType = type(str.join)
ClassMethodDescriptorType = type(dict.__dict__['fromkeys'])
-ModuleType = type(sys)
+ModuleType = type(_types)
try:
raise TypeError
@@ -60,7 +60,9 @@ def _m(self): pass
GetSetDescriptorType = type(FunctionType.__code__)
MemberDescriptorType = type(FunctionType.__globals__)
-del sys, _f, _g, _C, _c, _ag, _cell_factory # Not for export
+CapsuleType = _types.CapsuleType
+
+del _types, _f, _g, _C, _c, _ag, _cell_factory # Not for export
# Provide a PEP 3115 compliant mechanism for class creation
@@ -331,11 +333,4 @@ def wrapped(*args, **kwargs):
NoneType = type(None)
NotImplementedType = type(NotImplemented)
-def __getattr__(name):
- if name == 'CapsuleType':
- import _socket
- return type(_socket.CAPI)
- raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-
-__all__ = [n for n in globals() if n[:1] != '_']
-__all__ += ['CapsuleType']
+__all__ = [n for n in globals() if not n.startswith('_')] # for pydoc
diff --git a/Modules/Setup b/Modules/Setup
index f075571ab94577..f75f44e98c7818 100644
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -150,6 +150,7 @@ PYTHONPATH=$(COREPYTHONPATH)
#_socket socketmodule.c
#_statistics _statisticsmodule.c
#_struct _struct.c
+#_types _typesmodule.c
#_typing _typingmodule.c
#_zoneinfo _zoneinfo.c
#array arraymodule.c
diff --git a/Modules/Setup.bootstrap.in b/Modules/Setup.bootstrap.in
index 4dcc0f55176d0e..2b2e8cb3e3cacd 100644
--- a/Modules/Setup.bootstrap.in
+++ b/Modules/Setup.bootstrap.in
@@ -23,6 +23,7 @@ _sre _sre/sre.c
_sysconfig _sysconfig.c
_thread _threadmodule.c
time timemodule.c
+_types _typesmodule.c
_typing _typingmodule.c
_weakref _weakref.c
diff --git a/Modules/_typesmodule.c b/Modules/_typesmodule.c
new file mode 100644
index 00000000000000..aabb35f47eefc3
--- /dev/null
+++ b/Modules/_typesmodule.c
@@ -0,0 +1,37 @@
+/* _types module */
+
+#include "Python.h"
+#include "pycore_namespace.h" // _PyNamespace_Type
+
+static int
+_types_exec(PyObject *m)
+{
+ if (PyModule_AddObjectRef(m, "CapsuleType", (PyObject *)&PyCapsule_Type) <
0) {
+ return -1;
+ }
+ if (PyModule_AddObjectRef(m, "SimpleNamespace", (PyObject
*)&_PyNamespace_Type) < 0) {
+ return -1;
+ }
+ return 0;
+}
+
+static struct PyModuleDef_Slot _typesmodule_slots[] = {
+ {Py_mod_exec, _types_exec},
+ {Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
+ {Py_mod_gil, Py_MOD_GIL_NOT_USED},
+ {0, NULL}
+};
+
+static struct PyModuleDef typesmodule = {
+ .m_base = PyModuleDef_HEAD_INIT,
+ .m_name = "_types",
+ .m_doc = "Define names for built-in types.",
+ .m_size = 0,
+ .m_slots = _typesmodule_slots,
+};
+
+PyMODINIT_FUNC
+PyInit__types(void)
+{
+ return PyModuleDef_Init(&typesmodule);
+}
diff --git a/PC/config.c b/PC/config.c
index 5c6f37ccf21896..6ce2131c7b84d0 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -19,6 +19,7 @@ extern PyObject* PyInit__operator(void);
extern PyObject* PyInit__signal(void);
extern PyObject* PyInit__statistics(void);
extern PyObject* PyInit__sysconfig(void);
+extern PyObject* PyInit__types(void);
extern PyObject* PyInit__typing(void);
extern PyObject* PyInit_time(void);
extern PyObject* PyInit__thread(void);
@@ -107,6 +108,7 @@ struct _inittab _PyImport_Inittab[] = {
{"time", PyInit_time},
{"_thread", PyInit__thread},
{"_tokenize", PyInit__tokenize},
+ {"_types", PyInit__types},
{"_typing", PyInit__typing},
{"_statistics", PyInit__statistics},
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 27c50fa53dab87..ac2e7e848994a4 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -485,6 +485,7 @@
<ClCompile Include="..\Modules\_sysconfig.c" />
<ClCompile Include="..\Modules\_threadmodule.c" />
<ClCompile Include="..\Modules\_tracemalloc.c" />
+ <ClCompile Include="..\Modules\_typesmodule.c" />
<ClCompile Include="..\Modules\_typingmodule.c" />
<ClCompile Include="..\Modules\timemodule.c" />
<ClCompile Include="..\Modules\xxsubtype.c" />
diff --git a/PCbuild/pythoncore.vcxproj.filters
b/PCbuild/pythoncore.vcxproj.filters
index 617165b576e362..acb4ab35dcad97 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -998,6 +998,9 @@
<ClCompile Include="..\Modules\_statisticsmodule.c">
<Filter>Modules</Filter>
</ClCompile>
+ <ClCompile Include="..\Modules\_typesmodule.c">
+ <Filter>Modules</Filter>
+ </ClCompile>
<ClCompile Include="..\Modules\_typingmodule.c">
<Filter>Modules</Filter>
</ClCompile>
diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h
index 29dd5c1df0f23a..9ae15f8cfe71bf 100644
--- a/Python/stdlib_module_names.h
+++ b/Python/stdlib_module_names.h
@@ -94,6 +94,7 @@ static const char* _Py_stdlib_module_names[] = {
"_tkinter",
"_tokenize",
"_tracemalloc",
+"_types",
"_typing",
"_uuid",
"_warnings",
diff --git a/configure b/configure
index 49de2f5db55e71..1b75ddfa26dcdd 100755
--- a/configure
+++ b/configure
@@ -783,6 +783,8 @@ MODULE__INTERPRETERS_FALSE
MODULE__INTERPRETERS_TRUE
MODULE__TYPING_FALSE
MODULE__TYPING_TRUE
+MODULE__TYPES_FALSE
+MODULE__TYPES_TRUE
MODULE__STRUCT_FALSE
MODULE__STRUCT_TRUE
MODULE_SELECT_FALSE
@@ -31008,6 +31010,28 @@ then :
+fi
+
+
+ if test "$py_cv_module__types" != "n/a"
+then :
+ py_cv_module__types=yes
+fi
+ if test "$py_cv_module__types" = yes; then
+ MODULE__TYPES_TRUE=
+ MODULE__TYPES_FALSE='#'
+else
+ MODULE__TYPES_TRUE='#'
+ MODULE__TYPES_FALSE=
+fi
+
+ as_fn_append MODULE_BLOCK "MODULE__TYPES_STATE=$py_cv_module__types$as_nl"
+ if test "x$py_cv_module__types" = xyes
+then :
+
+
+
+
fi
@@ -33723,6 +33747,10 @@ if test -z "${MODULE__STRUCT_TRUE}" && test -z
"${MODULE__STRUCT_FALSE}"; then
as_fn_error $? "conditional \"MODULE__STRUCT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${MODULE__TYPES_TRUE}" && test -z "${MODULE__TYPES_FALSE}"; then
+ as_fn_error $? "conditional \"MODULE__TYPES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${MODULE__TYPING_TRUE}" && test -z "${MODULE__TYPING_FALSE}"; then
as_fn_error $? "conditional \"MODULE__TYPING\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index ac86a1f847e675..c449bb5ebb3cd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7787,6 +7787,7 @@ PY_STDLIB_MOD_SIMPLE([_queue])
PY_STDLIB_MOD_SIMPLE([_random])
PY_STDLIB_MOD_SIMPLE([select])
PY_STDLIB_MOD_SIMPLE([_struct])
+PY_STDLIB_MOD_SIMPLE([_types])
PY_STDLIB_MOD_SIMPLE([_typing])
PY_STDLIB_MOD_SIMPLE([_interpreters])
PY_STDLIB_MOD_SIMPLE([_interpchannels])
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
