[Python-checkins] CVS: python/dist/src/Python import.c,2.190,2.191

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv19622/python/Python

Modified Files:
	import.c 
Log Message:
On the macintosh don't take a quick exit in find_module() for frozen submodule imports: the frozen import goes through a different mechanism.

Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.190
retrieving revision 2.191
diff -C2 -d -r2.190 -r2.191
*** import.c	2001/10/25 21:38:59	2.190
--- import.c	2001/10/30 13:08:39	2.191
***************
*** 894,897 ****
--- 894,904 ----
  		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);
***************
*** 901,904 ****
--- 908,912 ----
  			     "No frozen submodule named %.200s", name);
  		return NULL;
+ #endif
  	}
  	if (path == NULL) {