From 13d7799f87ac3da61dfb3437b0768cfedc1d763b Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 23 Jul 2007 03:16:50 +0000 Subject: [PATCH] Fix import of frozen package submodules to use Unicode. Fixes test_frozen. --- Python/import.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Python/import.c b/Python/import.c index cd76fa265b4..25c768fea45 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1188,15 +1188,16 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf, Py_DECREF(meta_path); } - if (path != NULL && PyString_Check(path)) { + if (path != NULL && PyUnicode_Check(path)) { /* The only type of submodule allowed inside a "frozen" package are other frozen modules or packages. */ - if (PyString_Size(path) + 1 + strlen(name) >= (size_t)buflen) { + char *p = PyUnicode_AsString(path); + if (strlen(p) + 1 + strlen(name) >= (size_t)buflen) { PyErr_SetString(PyExc_ImportError, "full frozen module name too long"); return NULL; } - strcpy(buf, PyString_AsString(path)); + strcpy(buf, p); strcat(buf, "."); strcat(buf, name); strcpy(name, buf);