bpo-45855: Replaced deprecated PyImport_ImportModuleNoBlock with PyImport_ImportModule (GH-30046)

kumaraditya303 · web-flow · commit 41026c315501 · 2021-12-12T10:45:20.000+02:00
diff --git a/Misc/NEWS.d/next/C API/2021-12-11-08-41-36.bpo-45855.Lq2_gR.rst b/Misc/NEWS.d/next/C API/2021-12-11-08-41-36.bpo-45855.Lq2_gR.rst
@@ -0,0 +1 @@
+Replaced deprecated usage of :c:func:`PyImport_ImportModuleNoBlock` with :c:func:`PyImport_ImportModule` in stdlib modules. Patch by Kumar Aditya.
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
@@ -490,7 +490,7 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     if (context == NULL)
         context = PyUnicode_InternFromString("_ctypes.DllGetClassObject");
 
-    mod = PyImport_ImportModuleNoBlock("ctypes");
+    mod = PyImport_ImportModule("ctypes");
     if (!mod) {
         PyErr_WriteUnraisable(context ? context : Py_None);
         /* There has been a warning before about this already */
@@ -563,7 +563,7 @@ long Call_CanUnloadNow(void)
     if (context == NULL)
         context = PyUnicode_InternFromString("_ctypes.DllCanUnloadNow");
 
-    mod = PyImport_ImportModuleNoBlock("ctypes");
+    mod = PyImport_ImportModule("ctypes");
     if (!mod) {
 /*              OutputDebugString("Could not import ctypes"); */
         /* We assume that this error can only occur when shutting
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -3959,7 +3959,7 @@ static int
 update_lines_cols(void)
 {
     PyObject *o;
-    PyObject *m = PyImport_ImportModuleNoBlock("curses");
+    PyObject *m = PyImport_ImportModule("curses");
     _Py_IDENTIFIER(LINES);
     _Py_IDENTIFIER(COLS);
 
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -1625,7 +1625,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
         goto Done;
     {
         PyObject *format;
-        PyObject *time = PyImport_ImportModuleNoBlock("time");
+        PyObject *time = PyImport_ImportModule("time");
 
         if (time == NULL)
             goto Done;
@@ -1655,7 +1655,7 @@ static PyObject *
 time_time(void)
 {
     PyObject *result = NULL;
-    PyObject *time = PyImport_ImportModuleNoBlock("time");
+    PyObject *time = PyImport_ImportModule("time");
 
     if (time != NULL) {
         _Py_IDENTIFIER(time);
@@ -1678,7 +1678,7 @@ build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
     PyObject *args;
 
 
-    time = PyImport_ImportModuleNoBlock("time");
+    time = PyImport_ImportModule("time");
     if (time == NULL) {
         return NULL;
     }
@@ -5161,7 +5161,7 @@ datetime_strptime(PyObject *cls, PyObject *args)
         return NULL;
 
     if (module == NULL) {
-        module = PyImport_ImportModuleNoBlock("_strptime");
+        module = PyImport_ImportModule("_strptime");
         if (module == NULL)
             return NULL;
     }
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -8219,7 +8219,7 @@ wait_helper(PyObject *module, pid_t pid, int status, struct rusage *ru)
         memset(ru, 0, sizeof(*ru));
     }
 
-    PyObject *m = PyImport_ImportModuleNoBlock("resource");
+    PyObject *m = PyImport_ImportModule("resource");
     if (m == NULL)
         return NULL;
     struct_rusage = PyObject_GetAttr(m, get_posix_state(module)->struct_rusage);
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -765,7 +765,7 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args, PyObject *kwds)
     is_socket = 0;
     if (sockfd != INVALID_FD) {
         /* Import the _socket module to call WSAStartup() */
-        mod = PyImport_ImportModuleNoBlock("_socket");
+        mod = PyImport_ImportModule("_socket");
         if (mod == NULL)
             return NULL;
         Py_DECREF(mod);
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -895,7 +895,7 @@ time_strptime(PyObject *self, PyObject *args)
     PyObject *module, *func, *result;
     _Py_IDENTIFIER(_strptime_time);
 
-    module = PyImport_ImportModuleNoBlock("_strptime");
+    module = PyImport_ImportModule("_strptime");
     if (!module)
         return NULL;
 
@@ -1075,7 +1075,7 @@ time_tzset(PyObject *self, PyObject *unused)
 {
     PyObject* m;
 
-    m = PyImport_ImportModuleNoBlock("time");
+    m = PyImport_ImportModule("time");
     if (m == NULL) {
         return NULL;
     }
diff --git a/Objects/capsule.c b/Objects/capsule.c
@@ -215,7 +215,7 @@ PyCapsule_Import(const char *name, int no_block)
 
         if (object == NULL) {
             if (no_block) {
-                object = PyImport_ImportModuleNoBlock(trace);
+                object = PyImport_ImportModule(trace);
             } else {
                 object = PyImport_ImportModule(trace);
                 if (!object) {
diff --git a/Parser/pegen.c b/Parser/pegen.c
@@ -88,7 +88,7 @@ init_normalization(Parser *p)
     if (p->normalize) {
         return 1;
     }
-    PyObject *m = PyImport_ImportModuleNoBlock("unicodedata");
+    PyObject *m = PyImport_ImportModule("unicodedata");
     if (!m)
     {
         return 0;
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -461,7 +461,7 @@ fp_setreadl(struct tok_state *tok, const char* enc)
         return 0;
     }
 
-    io = PyImport_ImportModuleNoBlock("io");
+    io = PyImport_ImportModule("io");
     if (io == NULL)
         return 0;
 
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -1527,7 +1527,7 @@ static int _PyCodecRegistry_Init(void)
         }
     }
 
-    mod = PyImport_ImportModuleNoBlock("encodings");
+    mod = PyImport_ImportModule("encodings");
     if (mod == NULL) {
         return -1;
     }
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -447,7 +447,7 @@ display_source_line_with_margin(PyObject *f, PyObject *filename, int lineno, int
         }
     }
 
-    io = PyImport_ImportModuleNoBlock("io");
+    io = PyImport_ImportModule("io");
     if (io == NULL)
         return -1;
     binary = _PyObject_CallMethodId(io, &PyId_open, "Os", filename, "rb");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Replaced deprecated usage of :c:func:`PyImport_ImportModuleNoBlock` with :c:func:`PyImport_ImportModule` in stdlib modules. Patch by Kumar Aditya.
Original file line number	Diff line number	Diff line change
`@@ -3959,7 +3959,7 @@ static int`
`3959`	`3959`	`update_lines_cols(void)`
`3960`	`3960`	`{`
`3961`	`3961`	`PyObject *o;`
`3962`		`- PyObject *m = PyImport_ImportModuleNoBlock("curses");`
	`3962`	`+ PyObject *m = PyImport_ImportModule("curses");`
`3963`	`3963`	`_Py_IDENTIFIER(LINES);`
`3964`	`3964`	`_Py_IDENTIFIER(COLS);`
`3965`	`3965`
Original file line number	Diff line number	Diff line change
`@@ -8219,7 +8219,7 @@ wait_helper(PyObject module, pid_t pid, int status, struct rusage ru)`
`8219`	`8219`	`memset(ru, 0, sizeof(*ru));`
`8220`	`8220`	`}`
`8221`	`8221`
`8222`		`- PyObject *m = PyImport_ImportModuleNoBlock("resource");`
	`8222`	`+ PyObject *m = PyImport_ImportModule("resource");`
`8223`	`8223`	`if (m == NULL)`
`8224`	`8224`	`return NULL;`
`8225`	`8225`	`struct_rusage = PyObject_GetAttr(m, get_posix_state(module)->struct_rusage);`
Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ time_strptime(PyObject self, PyObject args)`
`895`	`895`	`PyObject module, func, *result;`
`896`	`896`	`_Py_IDENTIFIER(_strptime_time);`
`897`	`897`
`898`		`- module = PyImport_ImportModuleNoBlock("_strptime");`
	`898`	`+ module = PyImport_ImportModule("_strptime");`
`899`	`899`	`if (!module)`
`900`	`900`	`return NULL;`
`901`	`901`
`@@ -1075,7 +1075,7 @@ time_tzset(PyObject self, PyObject unused)`
`1075`	`1075`	`{`
`1076`	`1076`	`PyObject* m;`
`1077`	`1077`
`1078`		`- m = PyImport_ImportModuleNoBlock("time");`
	`1078`	`+ m = PyImport_ImportModule("time");`
`1079`	`1079`	`if (m == NULL) {`
`1080`	`1080`	`return NULL;`
`1081`	`1081`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ init_normalization(Parser *p)`
`88`	`88`	`if (p->normalize) {`
`89`	`89`	`return 1;`
`90`	`90`	`}`
`91`		`- PyObject *m = PyImport_ImportModuleNoBlock("unicodedata");`
	`91`	`+ PyObject *m = PyImport_ImportModule("unicodedata");`
`92`	`92`	`if (!m)`
`93`	`93`	`{`
`94`	`94`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ fp_setreadl(struct tok_state tok, const char enc)`
`461`	`461`	`return 0;`
`462`	`462`	`}`
`463`	`463`
`464`		`- io = PyImport_ImportModuleNoBlock("io");`
	`464`	`+ io = PyImport_ImportModule("io");`
`465`	`465`	`if (io == NULL)`
`466`	`466`	`return 0;`
`467`	`467`