Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #3080: Add PyImport_ImportFrozenModuleObject() 

find_frozen(), get_frozen_object(), is_frozen_package() and other functions
related to frozen modules use Unicode strings instead of byte strings.
This commit is contained in:
Victor Stinner 2011-03-20 01:50:21 +01:00
parent 9464d61cba
commit 53dc735168
3 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Doc/c-api/import.rst
View File

@ -217,7 +217,7 @@ Importing Modules
For internal use only. For internal use only.
.. c:function:: int PyImport_ImportFrozenModule(char *name) .. c:function:: int PyImport_ImportFrozenModuleObject(PyObject *name)
Load a frozen module named *name*. Return ``1`` for success, ``0`` if the Load a frozen module named *name*. Return ``1`` for success, ``0`` if the
module is not found, and ``-1`` with an exception set if the initialization module is not found, and ``-1`` with an exception set if the initialization
@ -225,6 +225,14 @@ Importing Modules
:c:func:`PyImport_ImportModule`. (Note the misnomer --- this function would :c:func:`PyImport_ImportModule`. (Note the misnomer --- this function would
reload the module if it was already imported.) reload the module if it was already imported.)
.. versionadded:: 3.3
.. c:function:: int PyImport_ImportFrozenModule(char *name)
Similar to :c:func:`PyImport_ImportFrozenModuleObject`, but the name is an
UTF-8 encoded string instead of a Unicode object.
.. c:type:: struct _frozen .. c:type:: struct _frozen

3
Include/import.h
View File

@ -58,6 +58,9 @@ PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
PyAPI_FUNC(void) PyImport_Cleanup(void); PyAPI_FUNC(void) PyImport_Cleanup(void);
PyAPI_FUNC(int) PyImport_ImportFrozenModuleObject(
PyObject *name
);
PyAPI_FUNC(int) PyImport_ImportFrozenModule( PyAPI_FUNC(int) PyImport_ImportFrozenModule(
char *name /* UTF-8 encoded string */ char *name /* UTF-8 encoded string */
); );

98
Python/import.c
View File

@ -1429,7 +1429,7 @@ get_sourcefile(char *file)
static PyObject *load_module(char *, FILE *, char *, int, PyObject *); static PyObject *load_module(char *, FILE *, char *, int, PyObject *);
static struct filedescr *find_module(char *, char *, PyObject *, static struct filedescr *find_module(char *, char *, PyObject *,
char *, size_t, FILE **, PyObject **); char *, size_t, FILE **, PyObject **);
static struct _frozen * find_frozen(char *); static struct _frozen * find_frozen(PyObject *);
/* Load a package and return its module object WITH INCREMENTED /* Load a package and return its module object WITH INCREMENTED
REFERENCE COUNT */ REFERENCE COUNT */
@ -1617,6 +1617,8 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
size_t saved_namelen; size_t saved_namelen;
char *saved_buf = NULL; char *saved_buf = NULL;
#endif #endif
PyObject *fullname_obj;
if (p_loader != NULL) if (p_loader != NULL)
*p_loader = NULL; *p_loader = NULL;
@ -1662,9 +1664,16 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
Py_DECREF(meta_path); Py_DECREF(meta_path);
} }
if (find_frozen(fullname) != NULL) { if (fullname != NULL) {
strcpy(buf, fullname); fullname_obj = PyUnicode_FromString(fullname);
return &fd_frozen; if (fullname == NULL)
return NULL;
if (find_frozen(fullname_obj) != NULL) {
Py_DECREF(fullname_obj);
strcpy(buf, fullname);
return &fd_frozen;
}
Py_DECREF(fullname_obj);
} }
if (path == NULL) { if (path == NULL) {
@ -2226,37 +2235,37 @@ init_builtin(char *name)
/* Frozen modules */ /* Frozen modules */
static struct _frozen * static struct _frozen *
find_frozen(char *name) find_frozen(PyObject *name)
{ {
struct _frozen *p; struct _frozen *p;
if (!name) if (name == NULL)
return NULL; return NULL;
for (p = PyImport_FrozenModules; ; p++) { for (p = PyImport_FrozenModules; ; p++) {
if (p->name == NULL) if (p->name == NULL)
return NULL; return NULL;
if (strcmp(p->name, name) == 0) if (PyUnicode_CompareWithASCIIString(name, p->name) == 0)
break; break;
} }
return p; return p;
} }
static PyObject * static PyObject *
get_frozen_object(char *name) get_frozen_object(PyObject *name)
{ {
struct _frozen *p = find_frozen(name); struct _frozen *p = find_frozen(name);
int size; int size;
if (p == NULL) { if (p == NULL) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"No such frozen object named %.200s", "No such frozen object named %R",
name); name);
return NULL; return NULL;
} }
if (p->code == NULL) { if (p->code == NULL) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"Excluded frozen object named %.200s", "Excluded frozen object named %R",
name); name);
return NULL; return NULL;
} }
@ -2267,14 +2276,14 @@ get_frozen_object(char *name)
} }
static PyObject * static PyObject *
is_frozen_package(char *name) is_frozen_package(PyObject *name)
{ {
struct _frozen *p = find_frozen(name); struct _frozen *p = find_frozen(name);
int size; int size;
if (p == NULL) { if (p == NULL) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"No such frozen object named %.200s", "No such frozen object named %R",
name); name);
return NULL; return NULL;
} }
@ -2294,19 +2303,20 @@ is_frozen_package(char *name)
This function is also used from frozenmain.c */ This function is also used from frozenmain.c */
int int
PyImport_ImportFrozenModule(char *name) PyImport_ImportFrozenModuleObject(PyObject *name)
{ {
struct _frozen *p = find_frozen(name); struct _frozen *p;
PyObject *co; PyObject *co, *m, *path;
PyObject *m;
int ispackage; int ispackage;
int size; int size;
p = find_frozen(name);
if (p == NULL) if (p == NULL)
return 0; return 0;
if (p->code == NULL) { if (p->code == NULL) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"Excluded frozen object named %.200s", "Excluded frozen object named %R",
name); name);
return -1; return -1;
} }
@ -2315,40 +2325,41 @@ PyImport_ImportFrozenModule(char *name)
if (ispackage) if (ispackage)
size = -size; size = -size;
if (Py_VerboseFlag) if (Py_VerboseFlag)
PySys_WriteStderr("import %s # frozen%s\n", PySys_FormatStderr("import %U # frozen%s\n",
name, ispackage ? " package" : ""); name, ispackage ? " package" : "");
co = PyMarshal_ReadObjectFromString((char *)p->code, size); co = PyMarshal_ReadObjectFromString((char *)p->code, size);
if (co == NULL) if (co == NULL)
return -1; return -1;
if (!PyCode_Check(co)) { if (!PyCode_Check(co)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"frozen object %.200s is not a code object", "frozen object %R is not a code object",
name); name);
goto err_return; goto err_return;
} }
if (ispackage) { if (ispackage) {
/* Set __path__ to the package name */ /* Set __path__ to the package name */
PyObject *d, *s, *l; PyObject *d, *l;
int err; int err;
m = PyImport_AddModule(name); m = PyImport_AddModuleObject(name);
if (m == NULL) if (m == NULL)
goto err_return; goto err_return;
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
s = PyUnicode_InternFromString(name);
if (s == NULL)
goto err_return;
l = PyList_New(1); l = PyList_New(1);
if (l == NULL) { if (l == NULL) {
Py_DECREF(s);
goto err_return; goto err_return;
} }
PyList_SET_ITEM(l, 0, s); Py_INCREF(name);
PyList_SET_ITEM(l, 0, name);
err = PyDict_SetItemString(d, "__path__", l); err = PyDict_SetItemString(d, "__path__", l);
Py_DECREF(l); Py_DECREF(l);
if (err != 0) if (err != 0)
goto err_return; goto err_return;
} }
m = PyImport_ExecCodeModuleEx(name, co, "<frozen>"); path = PyUnicode_FromString("<frozen>");
if (path == NULL)
goto err_return;
m = PyImport_ExecCodeModuleObject(name, co, path, NULL);
Py_DECREF(path);
if (m == NULL) if (m == NULL)
goto err_return; goto err_return;
Py_DECREF(co); Py_DECREF(co);
@ -2359,6 +2370,19 @@ err_return:
return -1; return -1;
} }
int
PyImport_ImportFrozenModule(char *name)
{
PyObject *nameobj;
int ret;
nameobj = PyUnicode_InternFromString(name);
if (nameobj == NULL)
return -1;
ret = PyImport_ImportFrozenModuleObject(nameobj);
Py_DECREF(nameobj);
return ret;
}
/* Import a module, either built-in, frozen, or external, and return /* Import a module, either built-in, frozen, or external, and return
its module object WITH INCREMENTED REFERENCE COUNT */ its module object WITH INCREMENTED REFERENCE COUNT */
@ -3282,19 +3306,19 @@ imp_init_builtin(PyObject *self, PyObject *args)
static PyObject * static PyObject *
imp_init_frozen(PyObject *self, PyObject *args) imp_init_frozen(PyObject *self, PyObject *args)
{ {
char *name; PyObject *name;
int ret; int ret;
PyObject *m; PyObject *m;
if (!PyArg_ParseTuple(args, "s:init_frozen", &name)) if (!PyArg_ParseTuple(args, "U:init_frozen", &name))
return NULL; return NULL;
ret = PyImport_ImportFrozenModule(name); ret = PyImport_ImportFrozenModuleObject(name);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
if (ret == 0) { if (ret == 0) {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }
m = PyImport_AddModule(name); m = PyImport_AddModuleObject(name);
Py_XINCREF(m); Py_XINCREF(m);
return m; return m;
} }
@ -3302,9 +3326,9 @@ imp_init_frozen(PyObject *self, PyObject *args)
static PyObject * static PyObject *
imp_get_frozen_object(PyObject *self, PyObject *args) imp_get_frozen_object(PyObject *self, PyObject *args)
{ {
char *name; PyObject *name;
if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name)) if (!PyArg_ParseTuple(args, "U:get_frozen_object", &name))
return NULL; return NULL;
return get_frozen_object(name); return get_frozen_object(name);
} }
@ -3312,9 +3336,9 @@ imp_get_frozen_object(PyObject *self, PyObject *args)
static PyObject * static PyObject *
imp_is_frozen_package(PyObject *self, PyObject *args) imp_is_frozen_package(PyObject *self, PyObject *args)
{ {
char *name; PyObject *name;
if (!PyArg_ParseTuple(args, "s:is_frozen_package", &name)) if (!PyArg_ParseTuple(args, "U:is_frozen_package", &name))
return NULL; return NULL;
return is_frozen_package(name); return is_frozen_package(name);
} }
@ -3331,9 +3355,9 @@ imp_is_builtin(PyObject *self, PyObject *args)
static PyObject * static PyObject *
imp_is_frozen(PyObject *self, PyObject *args) imp_is_frozen(PyObject *self, PyObject *args)
{ {
char *name; PyObject *name;
struct _frozen *p; struct _frozen *p;
if (!PyArg_ParseTuple(args, "s:is_frozen", &name)) if (!PyArg_ParseTuple(args, "U:is_frozen", &name))
return NULL; return NULL;
p = find_frozen(name); p = find_frozen(name);
return PyBool_FromLong((long) (p == NULL ? 0 : p->size)); return PyBool_FromLong((long) (p == NULL ? 0 : p->size));