Case-checking was broken on the Macintosh. Fixed.

jackjansen · jackjansen · commit 4df3c5284f33 · 2001-03-20T23:09:54.000Z
diff --git a/Python/import.c b/Python/import.c
@@ -979,13 +979,13 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
 #endif
 #ifdef macintosh
 		fdp = PyMac_FindModuleExtension(buf, &len, name);
-		if (fdp)
-			fp = fopen(buf, fdp->mode);
+		if (fdp) {
 #else
 		for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
 			strcpy(buf+len, fdp->suffix);
 			if (Py_VerboseFlag > 1)
 				PySys_WriteStderr("# trying %s\n", buf);
+#endif /* !macintosh */
 			fp = fopen(buf, fdp->mode);
 			if (fp != NULL) {
 				if (case_ok(buf, len, namelen, name))
@@ -996,7 +996,6 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
 				}
 			}
 		}
-#endif /* !macintosh */
 		if (fp != NULL)
 			break;
 	}

Original file line number	Diff line number	Diff line change
`@@ -979,13 +979,13 @@ find_module(char realname, PyObject path, char *buf, size_t buflen,`
`979`	`979`	`#endif`
`980`	`980`	`#ifdef macintosh`
`981`	`981`	`fdp = PyMac_FindModuleExtension(buf, &len, name);`
`982`		`- if (fdp)`
`983`		`- fp = fopen(buf, fdp->mode);`
	`982`	`+ if (fdp) {`
`984`	`983`	`#else`
`985`	`984`	`for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {`
`986`	`985`	`strcpy(buf+len, fdp->suffix);`
`987`	`986`	`if (Py_VerboseFlag > 1)`
`988`	`987`	`PySys_WriteStderr("# trying %s\n", buf);`
	`988`	`+#endif /* !macintosh */`
`989`	`989`	`fp = fopen(buf, fdp->mode);`
`990`	`990`	`if (fp != NULL) {`
`991`	`991`	`if (case_ok(buf, len, namelen, name))`
`@@ -996,7 +996,6 @@ find_module(char realname, PyObject path, char *buf, size_t buflen,`
`996`	`996`	`}`
`997`	`997`	`}`
`998`	`998`	`}`
`999`		`-#endif /* !macintosh */`
`1000`	`999`	`if (fp != NULL)`
`1001`	`1000`	`break;`
`1002`	`1001`	`}`