diff options
| author | Jeremy Hylton <jeremy@alum.mit.edu> | 2000-05-26 21:49:07 +0000 |
|---|---|---|
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2000-05-26 21:49:07 +0000 |
| commit | 847a9968e9289376d47e87ecdd374d280016bd8a (patch) | |
| tree | b847391964c150e58c282045e5f5c6a4e57cdac5 /PC | |
| parent | b80a77785943617f091bc85bc387cdc633be17e2 (diff) | |
| download | cpython-git-847a9968e9289376d47e87ecdd374d280016bd8a.tar.gz | |
Patch from M.-A. Lemburg:
Python on UNIX now trusts PYTHONHOME unconditionally
Modules/getpath.c:
Landmark changed to os.py.
Setting PYTHONHOME now unconditionally sets sys.prefix
(and sys.exec_prefix). No further checks are done whether the
standard lib can be found in that location or not. This is in
sync with the PC subdir getpath implementations.
PC/getpathp.c:
Landmark changed to os.py.
PC/os2vacpp/getpathp.c:
Landmark changed to os.py.
Note: BAW's checkin on exceptions.c eliminates earlier concerns about
a bogus PYTHONHOME value leading to a core dump. Instead it causes a
useless sys.path and prevents imports.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/getpathp.c | 4 | ||||
| -rw-r--r-- | PC/os2vacpp/getpathp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/PC/getpathp.c b/PC/getpathp.c index 2123b2a76c..4354853522 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -53,7 +53,7 @@ PERFORMANCE OF THIS SOFTWARE. * We attempt to locate the "Python Home" - if the PYTHONHOME env var is set, we believe it. Otherwise, we use the path of our host .EXE's - to try and locate our "landmark" (lib\\string.py) and deduce our home. + to try and locate our "landmark" (lib\\os.py) and deduce our home. - If we DO have a Python Home: The relevant sub-directories (Lib, plat-win, lib-tk, etc) are based on the Python Home - If we DO NOT have a Python Home, the core Python Path is @@ -110,7 +110,7 @@ PERFORMANCE OF THIS SOFTWARE. */ #ifndef LANDMARK -#define LANDMARK "lib\\string.py" +#define LANDMARK "lib\\os.py" #endif static char prefix[MAXPATHLEN+1]; diff --git a/PC/os2vacpp/getpathp.c b/PC/os2vacpp/getpathp.c index b7056ab1b4..a4a4d0efba 100644 --- a/PC/os2vacpp/getpathp.c +++ b/PC/os2vacpp/getpathp.c @@ -68,14 +68,14 @@ extern BOOL PyWin_IsWin32s(); * * Otherwise, if there is a PYTHONPATH environment variable, we return that. * - * Otherwise we try to find $progpath/lib/string.py, and if found, then + * Otherwise we try to find $progpath/lib/os.py, and if found, then * root is $progpath/lib, and we return Python path as compiled PYTHONPATH * with all "./lib" replaced by $root (as above). * */ #ifndef LANDMARK -#define LANDMARK "lib\\string.py" +#define LANDMARK "lib\\os.py" #endif static char prefix[MAXPATHLEN+1]; |