summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorRobert Rouhani <robert.rouhani@gmail.com>2020-05-06 00:32:14 (GMT)
committerGitHub <noreply@github.com>2020-05-06 00:32:14 (GMT)
commita32587a60da5939a3932bb30432d2bdd3d6203d4 (patch)
tree9b99559261efb7d55a13295b29b6e52bb0147efd /Python
parent2a3b876b0286b22a9058510d9e51dc4d60eeb89a (diff)
downloadcpython-a32587a60da5939a3932bb30432d2bdd3d6203d4.zip
cpython-a32587a60da5939a3932bb30432d2bdd3d6203d4.tar.gz
cpython-a32587a60da5939a3932bb30432d2bdd3d6203d4.tar.bz2
[3.8] bpo-40417: Fix deprecation warning in PyImport_ReloadModule (GH-19750) (GH-19934)
Automerge-Triggered-By: @brettcannon. (cherry picked from commit f40bd466bf14029e2687e36e965875adf9d4be1a) Co-authored-by: Robert Rouhani <robert.rouhani@gmail.com>
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Python/import.c b/Python/import.c
index b4074d1..b73fe2f 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1908,23 +1908,23 @@ PyImport_ImportModuleLevel(const char *name, PyObject *globals, PyObject *locals
PyObject *
PyImport_ReloadModule(PyObject *m)
{
- _Py_IDENTIFIER(imp);
+ _Py_IDENTIFIER(importlib);
_Py_IDENTIFIER(reload);
PyObject *reloaded_module = NULL;
- PyObject *imp = _PyImport_GetModuleId(&PyId_imp);
- if (imp == NULL) {
+ PyObject *importlib = _PyImport_GetModuleId(&PyId_importlib);
+ if (importlib == NULL) {
if (PyErr_Occurred()) {
return NULL;
}
- imp = PyImport_ImportModule("imp");
- if (imp == NULL) {
+ importlib = PyImport_ImportModule("importlib");
+ if (importlib == NULL) {
return NULL;
}
}
- reloaded_module = _PyObject_CallMethodIdObjArgs(imp, &PyId_reload, m, NULL);
- Py_DECREF(imp);
+ reloaded_module = _PyObject_CallMethodIdObjArgs(importlib, &PyId_reload, m, NULL);
+ Py_DECREF(importlib);
return reloaded_module;
}