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

Timestamp:

Mar 21, 2014, 1:39:52 PM (11 years ago)

Author:

dmik

Message:

python: Use Posix directory scheme everywhere on OS/2.

File:

• python/trunk/Lib/site.py (modified) (1 diff)

python/trunk/Lib/site.py

@@ -286 +286 @@
         seen.add(prefix)
 
-        if sys.platform in ('os2emx', 'riscos'):
+        if sys.platform in ('riscos'):
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-        elif sys.platform == 'os2knix':
-            sitepackages.append(os.path.join(prefix, "lib",
-                                        "python" + sys.version[:3],
-                                        "site-packages"))
-            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-        elif os.sep == '/':
+        elif os.sep == '/' or os.name == 'os2':
             sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
                                         "site-packages"))
             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+            if os.name == 'os2':
+                sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
         else:
             sitepackages.append(prefix)