[Python-checkins] python/dist/src/Python import.c,2.199,2.200
jackjansen@sourceforge.net
jackjansen@sourceforge.net
Thu, 11 Apr 2002 13:46:25 -0700
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv9001/Python/Python
Modified Files:
import.c
Log Message:
Got rid of ifdefs for long-obsolete GUSI versions.
Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.199
retrieving revision 2.200
diff -C2 -d -r2.199 -r2.200
*** import.c 9 Apr 2002 18:00:58 -0000 2.199
--- import.c 11 Apr 2002 20:46:23 -0000 2.200
***************
*** 1140,1146 ****
#elif defined(macintosh)
#include <TextUtils.h>
- #ifdef USE_GUSI1
- #include "TFileSpec.h" /* for Path2FSSpec() */
- #endif
#elif defined(__MACH__) && defined(__APPLE__) && defined(HAVE_DIRENT_H)
--- 1140,1143 ----
***************
*** 1216,1238 ****
return 1;
- #ifndef USE_GUSI1
err = FSMakeFSSpec(0, 0, Pstring(buf), &fss);
- #else
- /* GUSI's Path2FSSpec() resolves all possible aliases nicely on
- the way, which is fine for all directories, but here we need
- the original name of the alias file (say, Dlg.ppc.slb, not
- toolboxmodules.ppc.slb). */
- char *colon;
- err = Path2FSSpec(buf, &fss);
- if (err == noErr) {
- colon = strrchr(buf, ':'); /* find filename */
- if (colon != NULL)
- err = FSMakeFSSpec(fss.vRefNum, fss.parID,
- Pstring(colon+1), &fss);
- else
- err = FSMakeFSSpec(fss.vRefNum, fss.parID,
- fss.name, &fss);
- }
- #endif
if (err) {
PyErr_Format(PyExc_NameError,
--- 1213,1217 ----