[Python-checkins] CVS: python/dist/src/PC getpathp.c,1.13,1.14

[Jeremy Hylton]

Update of /cvsroot/python/python/dist/src/PC
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11753/PC

Modified Files:
	getpathp.c 
Log Message:
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.



Index: getpathp.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/getpathp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** getpathp.c	2000/03/30 19:45:39	1.13
--- getpathp.c	2000/05/26 21:49:07	1.14
***************
*** 54,58 ****
     * 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.
       - If we DO have a Python Home: The relevant sub-directories (Lib, 
         plat-win, lib-tk, etc) are based on the Python Home
--- 54,58 ----
     * 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\\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
***************
*** 111,115 ****
  
  #ifndef LANDMARK
! #define LANDMARK "lib\\string.py"
  #endif
  
--- 111,115 ----
  
  #ifndef LANDMARK
! #define LANDMARK "lib\\os.py"
  #endif