Changeset 383 for python

Timestamp:

Mar 13, 2014, 9:58:41 PM (11 years ago)

Author:

dmik

Message:

Restore original dynamic 'sys.prefix' detection.

This in particular reverts r20 and parts of r10. These hacks are not
necessary after properly defining 'sys.path' entries in 'site.py'.

Location:

python/trunk

Files:

• Lib/site.py (modified) (2 diffs)
• Modules/getpath.c (modified) (4 diffs)

python/trunk/Lib/site.py

@@ -263 +263 @@
         seen.append(prefix)
 
-        if sys.platform in ('os2emx', 'os2knix', 'riscos'):
+        if sys.platform in ('os2emx', 'riscos'):
             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+        elif sys.platform == 'os2knix':
+            sitedirs.append(os.path.join(prefix, "lib",
+                                        "python" + sys.version[:3],
+                                        "site-packages"))
+            sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
         elif os.sep == '/':
             sitedirs.append(os.path.join(prefix, "lib",
@@ -488 +493 @@
     abs__file__()
     known_paths = removeduppaths()
-    if (os.name == "posix" and sys.path and
-        os.path.basename(sys.path[-1]) == "Modules"):
+    if ((os.name == "posix" or os.name == "os2") and
+        sys.path and os.path.basename(sys.path[-1]) == "Modules"):
         addbuilddir()
+        if (os.name == "os2"):
+            setBEGINLIBPATH()
     if ENABLE_USER_SITE is None:
         ENABLE_USER_SITE = check_enableusersite()
     known_paths = addusersitepackages(known_paths)
     known_paths = addsitepackages(known_paths)
-    if sys.platform == 'os2emx' or sys.platform == 'os2knix':
-        if (sys.path and os.path.basename(sys.path[-1]) == "Modules"):
-            addbuilddir()
-        setBEGINLIBPATH()
     setquit()
     setcopyright()

python/trunk/Modules/getpath.c

@@ -117 +117 @@
 #endif
 
-#ifndef __EMX__
 #ifndef PYTHONPATH
 #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
               EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-#endif
-#else
-//#define PYTHONPATH    "./Lib;./Lib/plat-" PLATFORM \
-//                      ";./Lib/lib-dynload;./Lib/site-packages"
-// force unixroot
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-" PLATFORM ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/site-packages" ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ":" \
-/* now local (for building) */ \
-              "./lib" ":" \
-              "./lib/plat-" PLATFORM ":" \
-              "./lib/site-packages" ":" \
-              "./lib/lib-dynload"
 #endif
 
@@ -660 +645 @@
      * return the compiled-in defaults instead.
      */
-#ifndef __KLIBC__ // YD force hardcoded build prefix
     if (pfound > 0) {
         reduce(prefix);
@@ -670 +654 @@
     }
     else
-#endif
         strncpy(prefix, PREFIX, MAXPATHLEN);
 
-#ifndef __KLIBC__ // YD force hardcoded build exec_prefix
     if (efound > 0) {
         reduce(exec_prefix);
@@ -682 +664 @@
     }
     else
-#endif
         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
 }