diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 1997-10-07 21:48:31 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 1997-10-07 21:48:31 (GMT) |
| commit | c73f83c8d9427404576cd2f88bf665cf65de67f3 (patch) | |
| tree | e831065cbb84711bf4fd287cee16fa5766ce7022 | |
| parent | 55e3927f58b848f0c980158527270b172a7ac68b (diff) | |
| download | cpython-c73f83c8d9427404576cd2f88bf665cf65de67f3.zip cpython-c73f83c8d9427404576cd2f88bf665cf65de67f3.tar.gz cpython-c73f83c8d9427404576cd2f88bf665cf65de67f3.tar.bz2 | |
Fixed for new "import dir.module" semantics. Needs accompanying fix in
import.c (yes Guido, I'll send it tomorrow)
| -rw-r--r-- | Mac/Python/macglue.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index 50b89e2..0adbce1 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -862,8 +862,13 @@ PyMac_FindModuleExtension(char *buf, int *lenp, char *module) if ( !_PyImport_Filetab[0].suffix ) return 0; +#if 0 + /* Pre 1.5a4 */ strcpy(buf+*lenp, module); strcpy(buf+*lenp+modnamelen, _PyImport_Filetab[0].suffix); +#else + strcpy(buf+*lenp, _PyImport_Filetab[0].suffix); +#endif if ( FSMakeFSSpec(0, 0, Pstring(buf), &fss) == noErr ) return _PyImport_Filetab; /* @@ -887,7 +892,11 @@ PyMac_FindModuleExtension(char *buf, int *lenp, char *module) fprintf(stderr, "# trying %s%s\n", buf, fdp->suffix); if ( FSMakeFSSpec(refnum, dirid, fnbuf, &fss) == noErr ) { /* Found it. */ +#if 0 strcpy(buf+*lenp+modnamelen, fdp->suffix); +#else + strcpy(buf+*lenp+modnamelen, fdp->suffix); +#endif *lenp = strlen(buf); return fdp; } |