diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-03-15 14:28:40 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-03-15 14:28:40 (GMT) |
| commit | d11f93c475e2f4151eb60c5973bb36c6131d4921 (patch) | |
| tree | 346f55a9be5345f087a1e393dfd18c9fe2de76e3 /Mac/scripts/ConfigurePython.py | |
| parent | 8ef786ea955d28e70def11c9cd0735dc0ed697bc (diff) | |
| download | cpython-d11f93c475e2f4151eb60c5973bb36c6131d4921.zip cpython-d11f93c475e2f4151eb60c5973bb36c6131d4921.tar.gz cpython-d11f93c475e2f4151eb60c5973bb36c6131d4921.tar.bz2 | |
Look for shared libraries first in kLocalDomain and then in kOnSystemDisk.
Don't do sys.prefix==os.getcwd() check unless we're an applet.
Diffstat (limited to 'Mac/scripts/ConfigurePython.py')
| -rw-r--r-- | Mac/scripts/ConfigurePython.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py index f651b04..d5d6687 100644 --- a/Mac/scripts/ConfigurePython.py +++ b/Mac/scripts/ConfigurePython.py @@ -46,10 +46,13 @@ def getextensiondirfile(fname): import macfs import MACFS try: - vrefnum, dirid = macfs.FindFolder(MACFS.kOnSystemDisk, MACFS.kSharedLibrariesFolderType, 0) - fss = macfs.FSSpec((vrefnum, dirid, fname)) + vrefnum, dirid = macfs.FindFolder(MACFS.kLocalDomain, MACFS.kSharedLibrariesFolderType, 1) except macfs.error: - return None + try: + vrefnum, dirid = macfs.FindFolder(MACFS.kOnSystemDisk, MACFS.kSharedLibrariesFolderType, 1) + except macfs.error: + return None + fss = macfs.FSSpec((vrefnum, dirid, fname)) return fss.as_pathname() def mkcorealias(src, altsrc): @@ -120,7 +123,11 @@ def main(): oldcwd = os.getcwd() os.chdir(sys.prefix) newcwd = os.getcwd() - if oldcwd != newcwd: + if verbose: + print "Not running as applet: Skipping check for preference file correctness." + elif oldcwd != newcwd: + # Hack to make sure we get the new MACFS + sys.path.insert(0, os.path.join(oldcwd, ':Mac:Lib')) import Dlg rv = Dlg.CautionAlert(ALERT_NOTPYTHONFOLDER, None) if rv == ALERT_NOTPYTHONFOLDER_REMOVE_QUIT: |