Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 65380:844ed6dddc03
imp.cache_from_source() uses PyUnicode_FSConverter() to support surrogates in
module path
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Fri, 15 Oct 2010 20:34:32 +0000 |
| parents | bb30393d1ea1 |
| children | 90052889ce3d |
line wrap: on
line diff
--- a/Python/import.c Fri Oct 15 19:46:19 2010 +0000 +++ b/Python/import.c Fri Oct 15 20:34:32 2010 +0000 @@ -3460,21 +3460,24 @@ static char *kwlist[] = {"path", "debug_override", NULL}; char buf[MAXPATHLEN+1]; - char *pathname, *cpathname; + PyObject *pathbytes; + char *cpathname; PyObject *debug_override = Py_None; int debug = !Py_OptimizeFlag; if (!PyArg_ParseTupleAndKeywords( - args, kws, "es|O", kwlist, - Py_FileSystemDefaultEncoding, &pathname, &debug_override)) + args, kws, "O&|O", kwlist, + PyUnicode_FSConverter, &pathbytes, &debug_override)) return NULL; if (debug_override != Py_None) if ((debug = PyObject_IsTrue(debug_override)) < 0) return NULL; - cpathname = make_compiled_pathname(pathname, buf, MAXPATHLEN+1, debug); - PyMem_Free(pathname); + cpathname = make_compiled_pathname( + PyBytes_AS_STRING(pathbytes), + buf, MAXPATHLEN+1, debug); + Py_DECREF(pathbytes); if (cpathname == NULL) { PyErr_Format(PyExc_SystemError, "path buffer too short");