summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-25 14:29:00 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-25 14:29:00 (GMT)
commit04778a8150430edc2c441f2f86193ca690d60aa3 (patch)
tree0cf223fb7b2516fcbbbc8183e5cd5799abd7a5b6
parent8a021009ea5097dc7914d64b075f95133c15a58f (diff)
downloadcpython-04778a8150430edc2c441f2f86193ca690d60aa3.zip
cpython-04778a8150430edc2c441f2f86193ca690d60aa3.tar.gz
cpython-04778a8150430edc2c441f2f86193ca690d60aa3.tar.bz2
make PyImport_ImportModuleLevel's first arg const like similiar functions (closes #12173)
-rw-r--r--Include/import.h2
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/import.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/Include/import.h b/Include/import.h
index 6331edf..45544111 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -44,7 +44,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(
const char *name /* UTF-8 encoded string */
);
PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(
- char *name, /* UTF-8 encoded string */
+ const char *name, /* UTF-8 encoded string */
PyObject *globals,
PyObject *locals,
PyObject *fromlist,
diff --git a/Misc/NEWS b/Misc/NEWS
index 6762731..36a3c9d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -826,6 +826,9 @@ C-API
- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with
Mercurial.
+- Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const
+ char *` instead of `char *1`.
+
Documentation
-------------
diff --git a/Python/import.c b/Python/import.c
index 5360d57..bfb976c 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2818,7 +2818,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
}
PyObject *
-PyImport_ImportModuleLevel(char *name, PyObject *globals, PyObject *locals,
+PyImport_ImportModuleLevel(const char *name, PyObject *globals, PyObject *locals,
PyObject *fromlist, int level)
{
PyObject *nameobj, *mod;