From: Guido van Rossum <guido@python.org>
Date: Mon, 23 Jul 2007 03:16:50 +0000 (+0000)
Subject: Fix import of frozen package submodules to use Unicode.  Fixes test_frozen.
X-Git-Tag: v3.0a1~589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13d7799f87ac3da61dfb3437b0768cfedc1d763b;p=python

Fix import of frozen package submodules to use Unicode.  Fixes test_frozen.
---

diff --git a/Python/import.c b/Python/import.c
index cd76fa265b..25c768fea4 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);