[Python-checkins] bpo-42599: Remove useless PyModule_GetWarningsModule() (GH-23691)
vstinner
webhook-mailer at python.org
Tue Dec 8 09:42:46 EST 2020
https://github.com/python/cpython/commit/0f91f586ae9b76c3bb44559bd8cd473b1b8de5ff
commit: 0f91f586ae9b76c3bb44559bd8cd473b1b8de5ff
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: vstinner <vstinner at python.org>
date: 2020-12-08T15:42:42+01:00
summary:
bpo-42599: Remove useless PyModule_GetWarningsModule() (GH-23691)
Removed PyModule_GetWarningsModule() which is useless due to
the _warnings module was converted to a builtin module in 2.6.
files:
M Doc/whatsnew/3.10.rst
M Python/errors.c
M Python/pylifecycle.c
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index a5cb4e30616cd..23e28aa4fd8fc 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -480,6 +480,11 @@ Removed
into their code.
(Contributed by Dong-hee Na and Terry J. Reedy in :issue:`42299`.)
+* Removed the :c:func:`PyModule_GetWarningsModule` function that was useless
+ now due to the _warnings module was converted to a builtin module in 2.6.
+ (Contributed by Hai Shi in :issue:`42599`.)
+
+
Porting to Python 3.10
======================
diff --git a/Python/errors.c b/Python/errors.c
index 8242ac69785d4..213108f681bb7 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1534,9 +1534,6 @@ PyErr_WriteUnraisable(PyObject *obj)
}
-extern PyObject *PyModule_GetWarningsModule(void);
-
-
void
PyErr_SyntaxLocation(const char *filename, int lineno)
{
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 428c887ef41c5..70824ff674129 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -97,14 +97,6 @@ _Py_IsFinalizing(void)
int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \
PyOS_mystrnicmp; /* Python/pystrcmp.o */
-/* PyModule_GetWarningsModule is no longer necessary as of 2.6
-since _warnings is builtin. This API should not be used. */
-PyObject *
-PyModule_GetWarningsModule(void)
-{
- return PyImport_ImportModule("warnings");
-}
-
/* APIs to access the initialization flags
*
More information about the Python-checkins
mailing list