mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

zipimport: find_module(), is_package() and get_source() supports surrogates

Browse source 
Use PyUnicode_FSConverter to support surrogates in the full name.
This commit is contained in:
Victor Stinner 2010-10-18 20:44:08 +00:00
parent 269aeb7c0d
commit 0410656b30
1 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Modules/zipimport.c
View file

@ -255,13 +255,13 @@ enum zi_module_info {
/* Return some information about a module. */ /* Return some information about a module. */
static enum zi_module_info static enum zi_module_info
get_module_info(ZipImporter *self, char *fullname) get_module_info(ZipImporter *self, PyObject *fullname)
{ {
char *subname, path[MAXPATHLEN + 1]; char *subname, path[MAXPATHLEN + 1];
int len; int len;
struct st_zip_searchorder *zso; struct st_zip_searchorder *zso;
subname = get_subname(fullname); subname = get_subname(PyBytes_AS_STRING(fullname));
len = make_filename(self->prefix, subname, path, sizeof(path)); len = make_filename(self->prefix, subname, path, sizeof(path));
if (len < 0) if (len < 0)
@ -286,14 +286,15 @@ zipimporter_find_module(PyObject *obj, PyObject *args)
{ {
ZipImporter *self = (ZipImporter *)obj; ZipImporter *self = (ZipImporter *)obj;
PyObject *path = NULL; PyObject *path = NULL;
char *fullname; PyObject *fullname;
enum zi_module_info mi; enum zi_module_info mi;
if (!PyArg_ParseTuple(args, "s|O:zipimporter.find_module", if (!PyArg_ParseTuple(args, "O&|O:zipimporter.find_module",
&fullname, &path)) PyUnicode_FSConverter, &fullname, &path))
return NULL; return NULL;
mi = get_module_info(self, fullname); mi = get_module_info(self, fullname);
Py_DECREF(fullname);
if (mi == MI_ERROR) if (mi == MI_ERROR)
return NULL; return NULL;
if (mi == MI_NOT_FOUND) { if (mi == MI_NOT_FOUND) {
@ -403,22 +404,27 @@ static PyObject *
zipimporter_is_package(PyObject *obj, PyObject *args) zipimporter_is_package(PyObject *obj, PyObject *args)
{ {
ZipImporter *self = (ZipImporter *)obj; ZipImporter *self = (ZipImporter *)obj;
char *fullname; PyObject *fullname;
enum zi_module_info mi; enum zi_module_info mi;
if (!PyArg_ParseTuple(args, "s:zipimporter.is_package", if (!PyArg_ParseTuple(args, "O&:zipimporter.is_package",
&fullname)) PyUnicode_FSConverter, &fullname))
return NULL; return NULL;
mi = get_module_info(self, fullname); mi = get_module_info(self, fullname);
if (mi == MI_ERROR) if (mi == MI_ERROR)
return NULL; goto error;
if (mi == MI_NOT_FOUND) { if (mi == MI_NOT_FOUND) {
PyErr_Format(ZipImportError, "can't find module '%.200s'", PyErr_Format(ZipImportError, "can't find module '%.200U'",
fullname); fullname);
return NULL; goto error;
} }
Py_DECREF(fullname);
return PyBool_FromLong(mi == MI_PACKAGE); return PyBool_FromLong(mi == MI_PACKAGE);
error:
Py_DECREF(fullname);
return NULL;
} }
static PyObject * static PyObject *
@ -490,24 +496,30 @@ zipimporter_get_source(PyObject *obj, PyObject *args)
{ {
ZipImporter *self = (ZipImporter *)obj; ZipImporter *self = (ZipImporter *)obj;
PyObject *toc_entry; PyObject *toc_entry;
char *fullname, *subname, path[MAXPATHLEN+1]; PyObject *fullname;
char *subname, path[MAXPATHLEN+1];
int len; int len;
enum zi_module_info mi; enum zi_module_info mi;
if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname)) if (!PyArg_ParseTuple(args, "O&:zipimporter.get_source",
PyUnicode_FSConverter, &fullname))
return NULL; return NULL;
mi = get_module_info(self, fullname); mi = get_module_info(self, fullname);
if (mi == MI_ERROR) if (mi == MI_ERROR) {
return NULL; Py_DECREF(fullname);
if (mi == MI_NOT_FOUND) {
PyErr_Format(ZipImportError, "can't find module '%.200s'",
fullname);
return NULL; return NULL;
} }
subname = get_subname(fullname); if (mi == MI_NOT_FOUND) {
PyErr_Format(ZipImportError, "can't find module '%.200U'",
fullname);
Py_DECREF(fullname);
return NULL;
}
subname = get_subname(PyBytes_AS_STRING(fullname));
len = make_filename(self->prefix, subname, path, sizeof(path)); len = make_filename(self->prefix, subname, path, sizeof(path));
Py_DECREF(fullname);
if (len < 0) if (len < 0)
return NULL; return NULL;