mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 20:56:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

imp.load_dynamic() uses PyUnicode_FSConverter() to support surrogates

Browse source 
in the library path.
This commit is contained in:
Victor Stinner 2010-10-15 12:48:01 +00:00
parent f3170ccef8
commit 8dbf629bbd
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/import.c
View file

@ -3326,24 +3326,24 @@ static PyObject *
imp_load_dynamic(PyObject *self, PyObject *args) imp_load_dynamic(PyObject *self, PyObject *args)
{ {
char *name; char *name;
PyObject *pathbytes;
char *pathname; char *pathname;
PyObject *fob = NULL; PyObject *fob = NULL;
PyObject *m; PyObject *m;
FILE *fp = NULL; FILE *fp = NULL;
if (!PyArg_ParseTuple(args, "ses|O:load_dynamic", if (!PyArg_ParseTuple(args, "sO&|O:load_dynamic",
&name, &name, PyUnicode_FSConverter, &pathbytes, &fob))
Py_FileSystemDefaultEncoding, &pathname,
&fob))
return NULL; return NULL;
pathname = PyBytes_AS_STRING(pathbytes);
if (fob) { if (fob) {
fp = get_file(pathname, fob, "r"); fp = get_file(pathname, fob, "r");
if (fp == NULL) { if (fp == NULL) {
PyMem_Free(pathname); Py_DECREF(pathbytes);
return NULL; return NULL;
} }
} }
m = _PyImport_LoadDynamicModule(name, pathname, fp); m = _PyImport_LoadDynamicModule(name, pathname, fp);
PyMem_Free(pathname); Py_DECREF(pathbytes);
if (fp) if (fp)
fclose(fp); fclose(fp);
return m; return m;