From 04778a8150430edc2c441f2f86193ca690d60aa3 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 25 May 2011 09:29:00 -0500 Subject: [PATCH] make PyImport_ImportModuleLevel's first arg const like similiar functions (closes #12173) --- Include/import.h | 2 +- Misc/NEWS | 3 +++ Python/import.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Include/import.h b/Include/import.h index 6331edf7efe..4554411156f 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 6762731af66..36a3c9da183 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 5360d57c511..bfb976c77cb 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;