From 550fdae2f5bb1cdff849c3f47c1ae7c2b780e83b Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 30 Oct 2001 13:08:39 +0000
Subject: On the macintosh don't take a quick exit in find_module() for frozen
 submodule imports: the frozen import goes through a different mechanism.

---
 Python/import.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Python/import.c b/Python/import.c
index 81b5067..9f668bf 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -893,6 +893,13 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
 		strcat(buf, ".");
 		strcat(buf, name);
 		strcpy(name, buf);
+#ifdef macintosh
+		/* Freezing on the mac works different, and the modules are
+		** actually on sys.path. So we don't take the quick exit but
+		** continue with the normal flow.
+		*/
+		path = NULL;
+#else
 		if (find_frozen(name) != NULL) {
 			strcpy(buf, name);
 			return &fd_frozen;
@@ -900,6 +907,7 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
 		PyErr_Format(PyExc_ImportError,
 			     "No frozen submodule named %.200s", name);
 		return NULL;
+#endif
 	}
 	if (path == NULL) {
 		if (is_builtin(name)) {
-- 
cgit v0.12