diff options
| author | Benjamin Peterson <benjamin@python.org> | 2018-01-29 19:33:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 19:33:57 (GMT) |
| commit | c65ef772c335324deb03626cc447b89987781f27 (patch) | |
| tree | fba0ec89a83165958c4e9ce631442bb9ce9ff7fa | |
| parent | 2a2270db9be9bdac5ffd2d50929bf905e7391a06 (diff) | |
| download | cpython-c65ef772c335324deb03626cc447b89987781f27.zip cpython-c65ef772c335324deb03626cc447b89987781f27.tar.gz cpython-c65ef772c335324deb03626cc447b89987781f27.tar.bz2 | |
rename _imp initialization function to follow conventions (#5432)
When the C imp module became _imp in 6f44d66bc491bad5b8d897a68da68e009e27829d, the initialization function should have been renamed from PyInit_imp to PyInit__imp.
| -rw-r--r-- | Include/import.h | 2 | ||||
| -rw-r--r-- | Modules/config.c.in | 4 | ||||
| -rw-r--r-- | PC/config.c | 4 | ||||
| -rw-r--r-- | Python/import.c | 3 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/Include/import.h b/Include/import.h index 26c4b1f..ac3fc3b 100644 --- a/Include/import.h +++ b/Include/import.h @@ -10,7 +10,7 @@ extern "C" { #ifndef Py_LIMITED_API PyAPI_FUNC(_PyInitError) _PyImportZip_Init(void); -PyMODINIT_FUNC PyInit_imp(void); +PyMODINIT_FUNC PyInit__imp(void); #endif /* !Py_LIMITED_API */ PyAPI_FUNC(long) PyImport_GetMagicNumber(void); PyAPI_FUNC(const char *) PyImport_GetMagicTag(void); diff --git a/Modules/config.c.in b/Modules/config.c.in index 7b77199..d69e8e8 100644 --- a/Modules/config.c.in +++ b/Modules/config.c.in @@ -25,7 +25,7 @@ extern "C" { /* -- ADDMODULE MARKER 1 -- */ extern PyObject* PyMarshal_Init(void); -extern PyObject* PyInit_imp(void); +extern PyObject* PyInit__imp(void); extern PyObject* PyInit_gc(void); extern PyObject* PyInit__ast(void); extern PyObject* _PyWarnings_Init(void); @@ -39,7 +39,7 @@ struct _inittab _PyImport_Inittab[] = { {"marshal", PyMarshal_Init}, /* This lives in import.c */ - {"_imp", PyInit_imp}, + {"_imp", PyInit__imp}, /* This lives in Python/Python-ast.c */ {"_ast", PyInit__ast}, diff --git a/PC/config.c b/PC/config.c index 91f15b5..6209d7e 100644 --- a/PC/config.c +++ b/PC/config.c @@ -74,7 +74,7 @@ extern PyObject* PyInit__opcode(void); /* -- ADDMODULE MARKER 1 -- */ extern PyObject* PyMarshal_Init(void); -extern PyObject* PyInit_imp(void); +extern PyObject* PyInit__imp(void); struct _inittab _PyImport_Inittab[] = { @@ -147,7 +147,7 @@ struct _inittab _PyImport_Inittab[] = { {"marshal", PyMarshal_Init}, /* This lives it with import.c */ - {"_imp", PyInit_imp}, + {"_imp", PyInit__imp}, /* These entries are here for sys.builtin_module_names */ {"builtins", NULL}, diff --git a/Python/import.c b/Python/import.c index 8d30640..eb5aeac 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1,4 +1,3 @@ - /* Module definition and import implementation */ #include "Python.h" @@ -2253,7 +2252,7 @@ static struct PyModuleDef impmodule = { const char *_Py_CheckHashBasedPycsMode = "default"; PyMODINIT_FUNC -PyInit_imp(void) +PyInit__imp(void) { PyObject *m, *d; diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 82ab915..5db586e 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -312,7 +312,7 @@ initimport(PyInterpreterState *interp, PyObject *sysmod) Py_INCREF(interp->import_func); /* Import the _imp module */ - impmod = PyInit_imp(); + impmod = PyInit__imp(); if (impmod == NULL) { return _Py_INIT_ERR("can't import _imp"); } |