summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-03-20 23:09:54 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-03-20 23:09:54 (GMT)
commit4df3c5284f334fc77ffdf7cf7f32e6a93b787440 (patch)
tree7b3d5959d55bd35ad786f43706b9920dd2fe5593
parentfddef433d1aa55d3f9d5cf78398c101f56c5e939 (diff)
downloadcpython-4df3c5284f334fc77ffdf7cf7f32e6a93b787440.zip
cpython-4df3c5284f334fc77ffdf7cf7f32e6a93b787440.tar.gz
cpython-4df3c5284f334fc77ffdf7cf7f32e6a93b787440.tar.bz2
Case-checking was broken on the Macintosh. Fixed.
-rw-r--r--Python/import.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/import.c b/Python/import.c
index ef13c58..7f49e57 100644
--- 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;
}