From: Just van Rossum <just@letterror.com>
Date: Wed, 15 Aug 2001 21:20:42 +0000 (+0000)
Subject: Rewrote Jack's latest change so it does what it intended to do...
X-Git-Tag: v2.2a3~524
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba634b2ec3977cdc61ab097bd455d3ab0f925bf1;p=thirdparty%2FPython%2Fcpython.git

Rewrote Jack's latest change so it does what it intended to do...
---

diff --git a/Lib/site.py b/Lib/site.py
index a2de4f2d4740..eaa08a76e767 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -80,10 +80,14 @@ L = []
 _dirs_in_sys_path = {}
 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
+    # 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):
         L.append(dir)