- rel 2; rework options to avoid case when part of object files were built with one...

[packages/python3.git] / python3-pythonpath.patch

--- Python-3.0.1/Lib/distutils/tests/test_build_scripts.py.wiget	2004-08-26 07:44:02.000000000 +0200
+++ Python-3.0.1/Lib/distutils/tests/test_build_scripts.py	2009-03-14 18:12:32.000000000 +0100
@@ -58,7 +58,7 @@ class BuildScriptsTestCase(support.Tempd
                            "pass\n"))
         expected.append("script2.py")
         self.write_script(dir, "script2.py",
-                          ("#!/usr/bin/python\n"
+                          ("#!/usr/bin/python3\n"
                            "# bogus script w/ Python sh-bang\n"
                            "pass\n"))
         expected.append("shell.sh")
--- Python-3.0.1/Lib/distutils/tests/test_install_scripts.py.wiget	2004-08-03 20:53:07.000000000 +0200
+++ Python-3.0.1/Lib/distutils/tests/test_install_scripts.py	2009-03-14 18:12:32.000000000 +0100
@@ -48,7 +48,7 @@ class InstallScriptsTestCase(support.Tem
         write_script("script1.py", ("#! /usr/bin/env python2.3\n"
                                     "# bogus script w/ Python sh-bang\n"
                                     "pass\n"))
-        write_script("script2.py", ("#!/usr/bin/python\n"
+        write_script("script2.py", ("#!/usr/bin/python3\n"
                                     "# bogus script w/ Python sh-bang\n"
                                     "pass\n"))
         write_script("shell.sh", ("#!/bin/sh\n"
--- Python-3.0.1/Lib/cgi.py.wiget	2008-12-04 21:11:57.000000000 +0100
+++ Python-3.0.1/Lib/cgi.py	2009-03-14 18:12:32.000000000 +0100
@@ -1,6 +1,6 @@
-#! /usr/local/bin/python
+#! /usr/bin/python3
 
-# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
+# NOTE: the above "/usr/bin/python3" is NOT a mistake.  It is
 # intentionally NOT "/usr/bin/env python".  On many systems
 # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
 # scripts, and /usr/local/bin is the default directory where Python is
--- Python-3.0.1/Tools/pybench/pybench.py.wiget	2009-02-07 18:28:46.000000000 +0100
+++ Python-3.0.1/Tools/pybench/pybench.py	2009-03-14 18:12:32.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -O
+#!/usr/bin/python3 -O
 
 """ A Python Benchmark Suite
 
--- Python-3.0.1/Tools/scripts/fixps.py.wiget	2007-08-03 19:06:41.000000000 +0200
+++ Python-3.0.1/Tools/scripts/fixps.py	2009-03-14 18:12:32.000000000 +0100
@@ -15,13 +15,13 @@ def main():
             print(filename, ': can\'t open :', msg)
             continue
         line = f.readline()
-        if not re.match('^#! */usr/local/bin/python', line):
-            print(filename, ': not a /usr/local/bin/python script')
+        if not re.match('^#! */usr/bin/python3', line):
+            print(filename, ': not a /usr/bin/python3 script')
             f.close()
             continue
         rest = f.read()
         f.close()
-        line = re.sub('/usr/local/bin/python',
+        line = re.sub('/usr/bin/python3',
                       '/usr/bin/env python', line)
         print(filename, ':', repr(line))
         f = open(filename, "w")
--- Python-3.0.1/Doc/README.txt.wiget	2009-02-13 00:46:00.000000000 +0100
+++ Python-3.0.1/Doc/README.txt	2009-03-14 18:12:32.000000000 +0100
@@ -37,7 +37,7 @@ the top-level index `build/html/index.ht
 To use a Python interpreter that's not called ``python``, use the standard
 way to set Makefile variables, using e.g. ::
 
-   make html PYTHON=/usr/bin/python2.5
+   make html PYTHON=/usr/bin/python3
 
 Available make targets are: