mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 17:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Mods by Just to allow aliases in sys.path entries

Browse source
This commit is contained in:
Jack Jansen 1998-09-07 11:36:17 +00:00
parent 9819983994
commit 48a9c3634b
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mac/Python/macimport.c
View file

@ -48,6 +48,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif #endif
#include <CodeFragments.h> #include <CodeFragments.h>
#ifdef USE_GUSI
#include "TFileSpec.h" /* for Path2FSSpec() */
#endif
typedef void (*dl_funcptr)(); typedef void (*dl_funcptr)();
#define FUNCNAME_PATTERN "init%.200s" #define FUNCNAME_PATTERN "init%.200s"
@ -100,7 +104,11 @@ findnamedresource(
UseResFile(PyMac_AppRefNum); UseResFile(PyMac_AppRefNum);
filerh = -1; filerh = -1;
} else { } else {
#ifdef USE_GUSI
if ( Path2FSSpec(filename, &fss) != noErr ||
#else
if ( FSMakeFSSpec(0, 0, Pstring(filename), &fss) != noErr || if ( FSMakeFSSpec(0, 0, Pstring(filename), &fss) != noErr ||
#endif
FSpGetFInfo(&fss, &finfo) != noErr ) { FSpGetFInfo(&fss, &finfo) != noErr ) {
#ifdef INTERN_STRINGS #ifdef INTERN_STRINGS
if ( obj && max_not_a_file < MAXPATHCOMPONENTS && obj->ob_sinterned ) if ( obj && max_not_a_file < MAXPATHCOMPONENTS && obj->ob_sinterned )
@ -296,7 +304,12 @@ char *filename;
UseResFile(PyMac_AppRefNum); UseResFile(PyMac_AppRefNum);
filerh = -1; filerh = -1;
} else { } else {
#ifdef USE_GUSI
if ( (err=Path2FSSpec(filename, &fss)) != noErr ||
FSpGetFInfo(&fss, &finfo) != noErr )
#else
if ( (err=FSMakeFSSpec(0, 0, Pstring(filename), &fss)) != noErr ) if ( (err=FSMakeFSSpec(0, 0, Pstring(filename), &fss)) != noErr )
#endif
goto error; goto error;
if ( (err=FSpGetFInfo(&fss, &finfo)) != noErr ) if ( (err=FSpGetFInfo(&fss, &finfo)) != noErr )
goto error; goto error;
@ -401,6 +414,7 @@ PyMac_FindModuleExtension(char *buf, int *lenp, char *module)
unsigned char fnbuf[64]; unsigned char fnbuf[64];
int modnamelen = strlen(module); int modnamelen = strlen(module);
FSSpec fss; FSSpec fss;
FInfo finfo;
short refnum; short refnum;
long dirid; long dirid;
@ -419,8 +433,14 @@ PyMac_FindModuleExtension(char *buf, int *lenp, char *module)
#else #else
strcpy(buf+*lenp, _PyImport_Filetab[0].suffix); strcpy(buf+*lenp, _PyImport_Filetab[0].suffix);
#endif #endif
#ifdef USE_GUSI
if ( Path2FSSpec(buf, &fss) == noErr &&
FSpGetFInfo(&fss, &finfo) == noErr)
return _PyImport_Filetab;
#else
if ( FSMakeFSSpec(0, 0, Pstring(buf), &fss) == noErr ) if ( FSMakeFSSpec(0, 0, Pstring(buf), &fss) == noErr )
return _PyImport_Filetab; return _PyImport_Filetab;
#endif
/* /*
** We cannot check for fnfErr (unfortunately), it can mean either that ** We cannot check for fnfErr (unfortunately), it can mean either that
** the file doesn't exist (fine, we try others) or the path leading to it. ** the file doesn't exist (fine, we try others) or the path leading to it.