[Python-checkins] CVS: python/dist/src/Lib site.py,1.33,1.34

Just van Rossum jvr@users.sourceforge.net
Wed, 15 Aug 2001 14:20:45 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv22286

Modified Files:
	site.py 
Log Message:
Rewrote Jack's latest change so it does what it intended to do...

Index: site.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** site.py	2001/08/15 12:07:46	1.33
--- site.py	2001/08/15 21:20:42	1.34
***************
*** 81,88 ****
  for dir in sys.path:
      # Filter out paths that don't exist, but leave in the empty string
!     # since it's a special case. Except on the mac, where files are legal
!     # in sys.path.
!     if dir and not os.path.isdir(dir) and sys.platform != 'mac':
!         continue
      dir, dircase = makepath(dir)
      if not _dirs_in_sys_path.has_key(dircase):
--- 81,92 ----
  for dir in sys.path:
      # Filter out paths that don't exist, but leave in the empty string
!     # since it's a special case. We also need to special-case the Mac,
!     # as file names are allowed on sys.path there.
!     if sys.platform != 'mac':
!         if dir and not os.path.isdir(dir):
!             continue
!     else:
!         if dir and not os.path.exists(dir):
!             continue
      dir, dircase = makepath(dir)
      if not _dirs_in_sys_path.has_key(dircase):