[Python-checkins] CVS: python/dist/src/PC/os2vacpp getpathp.c,1.4,1.5

[Jeremy Hylton]

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

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/os2vacpp/getpathp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** getpathp.c	1998/07/27 13:49:04	1.4
--- getpathp.c	2000/05/26 21:49:07	1.5
***************
*** 69,73 ****
   * Otherwise, if there is a PYTHONPATH environment variable, we return that.
   *
!  * Otherwise we try to find $progpath/lib/string.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).
--- 69,73 ----
   * Otherwise, if there is a PYTHONPATH environment variable, we return that.
   *
!  * 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).
***************
*** 76,80 ****
  
  #ifndef LANDMARK
! #define LANDMARK "lib\\string.py"
  #endif
  
--- 76,80 ----
  
  #ifndef LANDMARK
! #define LANDMARK "lib\\os.py"
  #endif