Changeset 10 for python/trunk/Lib/site.py

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Lib/site.py (modified) (3 diffs)

python/trunk/Lib/site.py

@@ -232 +232 @@
         return os.path.expanduser(os.path.join(*args))
 
-    #if sys.platform in ('os2emx', 'riscos'):
+    #if sys.platform in ('os2emx', 'os2knix', 'riscos'):
     #    # Don't know what to put here
     #    USER_BASE = ''
@@ -263 +263 @@
         seen.append(prefix)
 
-        if sys.platform in ('os2emx', 'riscos'):
+        if sys.platform in ('os2emx', 'os2knix', 'riscos'):
             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
         elif os.sep == '/':
@@ -495 +495 @@
     known_paths = addusersitepackages(known_paths)
     known_paths = addsitepackages(known_paths)
-    if sys.platform == 'os2emx':
+    if sys.platform == 'os2emx' or sys.platform == 'os2knix':
+        if (sys.path and os.path.basename(sys.path[-1]) == "Modules"):
+            addbuilddir()
         setBEGINLIBPATH()
     setquit()