File python-3.3.0b1-localpath.patch of Package python3-base

Overview Repositories Revisions Requests Users Attributes Meta

File python-3.3.0b1-localpath.patch of Package python3-base

Index: Lib/site.py
===================================================================
--- Lib/site.py.orig	2012-08-07 13:44:51.000000000 +0200
+++ Lib/site.py	2012-08-07 13:44:52.000000000 +0200
@@ -71,7 +71,7 @@
 import builtins
 
 # Prefixes for site-packages; add additional prefixes like /usr/local here
-PREFIXES = [sys.prefix, sys.exec_prefix]
+PREFIXES = [sys.prefix, sys.exec_prefix, '/usr/local']
 # Enable per user site-packages directory
 # set it to False to disable the feature or True to force the feature
 ENABLE_USER_SITE = None
Index: Lib/test/test_site.py
===================================================================
--- Lib/test/test_site.py.orig	2012-06-26 22:19:48.000000000 +0200
+++ Lib/test/test_site.py	2012-08-07 13:44:52.000000000 +0200
@@ -239,12 +239,27 @@
             self.assertEqual(dirs[2], wanted)
         elif os.sep == '/':
             # OS X non-framwework builds, Linux, FreeBSD, etc
-            self.assertEqual(len(dirs), 2)
-            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+            i = 0
+            wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
                                   'site-packages')
-            self.assertEqual(dirs[0], wanted)
-            wanted = os.path.join('xoxo', 'lib', 'site-python')
-            self.assertEqual(dirs[1], wanted)
+            self.assertEqual(dirs[i], wanted)
+            i += 1
+            if sys.lib != 'lib':
+                wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+                                      'site-packages')
+                self.assertEqual(dirs[i], wanted)
+                i += 1
+
+            wanted = os.path.join('xoxo', sys.lib, 'site-python')
+            self.assertEqual(dirs[i], wanted)
+            i += 1
+            if sys.lib != 'lib':
+                wanted = os.path.join('xoxo', 'lib', 'site-python')
+                self.assertEqual(dirs[i], wanted)
+                i += 1
+
+            self.assertTrue(i in [2,4])
+            self.assertEqual(len(dirs), i)
         else:
             # other platforms
             self.assertEqual(len(dirs), 2)
Index: Lib/distutils/command/install.py
===================================================================
--- Lib/distutils/command/install.py.orig	2012-08-07 13:44:51.000000000 +0200
+++ Lib/distutils/command/install.py	2012-08-07 14:32:03.000000000 +0200
@@ -451,8 +451,8 @@
                     raise DistutilsOptionError(
                           "must not supply exec-prefix without prefix")
 
-                self.prefix = os.path.normpath(sys.prefix)
-                self.exec_prefix = os.path.normpath(sys.exec_prefix)
+                self.prefix = os.path.join(os.path.normpath(sys.prefix), 'local')
+                self.exec_prefix = os.path.join(os.path.normpath(sys.exec_prefix), 'local')
 
             else:
                 if self.exec_prefix is None:

Places

File python-3.3.0b1-localpath.patch of Package python3-base

Places