Fixed for new "import dir.module" semantics. Needs accompanying fix in

import.c (yes Guido, I'll send it tomorrow)

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 50b89e253130bb24f42e11d7b893dc923a5dd6a0..0adbce103666029dc9e66fb31d2afb5a34d2e460 100644 (file)
--- 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;
                }