diff -urN Python-3.0a1.org/Demo/cgi/cgi1.py Python-3.0a1/Demo/cgi/cgi1.py
--- Python-3.0a1.org/Demo/cgi/cgi1.py 2007-07-17 23:03:42.000000000 +0200
-+++ Python-3.0a1/Demo/cgi/cgi1.py 2007-09-02 19:56:49.628497973 +0200
++++ Python-3.0a1/Demo/cgi/cgi1.py 2007-09-02 20:58:24.437999826 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
-+#!/usr/bin/python
++#!/usr/bin/python3.0
"""CGI test 1 - check server setup."""
diff -urN Python-3.0a1.org/Demo/cgi/cgi2.py Python-3.0a1/Demo/cgi/cgi2.py
--- Python-3.0a1.org/Demo/cgi/cgi2.py 2007-08-06 23:21:05.000000000 +0200
-+++ Python-3.0a1/Demo/cgi/cgi2.py 2007-09-02 19:56:49.628497973 +0200
++++ Python-3.0a1/Demo/cgi/cgi2.py 2007-09-02 20:58:24.437999826 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
-+#!/usr/bin/python
++#!/usr/bin/python3.0
"""CGI test 2 - basic use of cgi module."""
diff -urN Python-3.0a1.org/Demo/cgi/cgi3.py Python-3.0a1/Demo/cgi/cgi3.py
--- Python-3.0a1.org/Demo/cgi/cgi3.py 2006-10-25 00:26:30.000000000 +0200
-+++ Python-3.0a1/Demo/cgi/cgi3.py 2007-09-02 19:56:49.632498200 +0200
++++ Python-3.0a1/Demo/cgi/cgi3.py 2007-09-02 20:58:24.437999826 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
-+#!/usr/bin/python
++#!/usr/bin/python3.0
"""CGI test 3 (persistent data)."""
diff -urN Python-3.0a1.org/Demo/tix/INSTALL.txt Python-3.0a1/Demo/tix/INSTALL.txt
--- Python-3.0a1.org/Demo/tix/INSTALL.txt 2006-10-25 00:26:31.000000000 +0200
-+++ Python-3.0a1/Demo/tix/INSTALL.txt 2007-09-02 19:56:49.636498427 +0200
++++ Python-3.0a1/Demo/tix/INSTALL.txt 2007-09-02 20:58:24.442000056 +0200
@@ -71,7 +71,7 @@
You should now have a working Tix implementation in Python. To see if all
is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
Under X windows, do
- /usr/local/bin/python Demo/tix/tixwidgets.py
-+ /usr/bin/python Demo/tix/tixwidgets.py
++ /usr/bin/python3.0 Demo/tix/tixwidgets.py
If this does not work, you may need to tell python where to find
the Tcl, Tk and Tix library files. This is done by setting the
TK_LIBRARY=/usr/local/lib/tk8.3 \
TIX_LIBRARY=/usr/local/lib/tix8.1 \
- /usr/local/bin/python Demo/tix/tixwidgets.py
-+ /usr/bin/python Demo/tix/tixwidgets.py
++ /usr/bin/python3.0 Demo/tix/tixwidgets.py
If you find any bugs or have suggestions for improvement, please report them
diff -urN Python-3.0a1.org/Doc/c-api/init.rst Python-3.0a1/Doc/c-api/init.rst
--- Python-3.0a1.org/Doc/c-api/init.rst 2007-08-17 02:23:32.000000000 +0200
-+++ Python-3.0a1/Doc/c-api/init.rst 2007-09-02 19:56:49.928514996 +0200
++++ Python-3.0a1/Doc/c-api/init.rst 2007-09-02 20:58:24.446000286 +0200
@@ -195,7 +195,7 @@
Return the *prefix* for installed platform-independent files. This is derived
through a number of complicated rules from the program name set with
:cfunc:`Py_SetProgramName` and some environment variables; for example, if the
- program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
-+ program name is ``'/usr/bin/python'``, the prefix is ``'/usr/local'``. The
++ program name is ``'/usr/bin/python3.0'``, the prefix is ``'/usr/local'``. The
returned string points into static storage; the caller should not modify its
value. This corresponds to the :makevar:`prefix` variable in the top-level
:file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
derived through a number of complicated rules from the program name set with
:cfunc:`Py_SetProgramName` and some environment variables; for example, if the
- program name is ``'/usr/local/bin/python'``, the exec-prefix is
-+ program name is ``'/usr/bin/python'``, the exec-prefix is
++ program name is ``'/usr/bin/python3.0'``, the exec-prefix is
``'/usr/local'``. The returned string points into static storage; the caller
should not modify its value. This corresponds to the :makevar:`exec_prefix`
variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
diff -urN Python-3.0a1.org/Doc/c-api/intro.rst Python-3.0a1/Doc/c-api/intro.rst
--- Python-3.0a1.org/Doc/c-api/intro.rst 2007-08-17 02:23:32.000000000 +0200
-+++ Python-3.0a1/Doc/c-api/intro.rst 2007-09-02 19:56:49.920514542 +0200
++++ Python-3.0a1/Doc/c-api/intro.rst 2007-09-02 20:58:24.450000516 +0200
@@ -536,7 +536,7 @@
path (the environment variable :envvar:`PATH`).
For instance, if the Python executable is found in
-:file:`/usr/local/bin/python`, it will assume that the libraries are in
-+:file:`/usr/bin/python`, it will assume that the libraries are in
++:file:`/usr/bin/python3.0`, it will assume that the libraries are in
:file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
the "fallback" location, used when no executable file named :file:`python` is
found along :envvar:`PATH`.) The user can override this behavior by setting the
+diff -urN Python-3.0a1.org/Doc/howto/pythonmac.rst Python-3.0a1/Doc/howto/pythonmac.rst
+--- Python-3.0a1.org/Doc/howto/pythonmac.rst 2007-08-17 02:23:33.000000000 +0200
++++ Python-3.0a1/Doc/howto/pythonmac.rst 2007-09-02 20:58:24.478002127 +0200
+@@ -44,7 +44,7 @@
+ symlink to the Python executable is placed in /usr/local/bin/.
+
+ The Apple-provided build of Python is installed in
+-:file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python`,
++:file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python3.0`,
+ respectively. You should never modify or delete these, as they are
+ Apple-controlled and are used by Apple- or third-party software.
+
diff -urN Python-3.0a1.org/Doc/install/index.rst Python-3.0a1/Doc/install/index.rst
--- Python-3.0a1.org/Doc/install/index.rst 2007-08-29 00:24:47.000000000 +0200
-+++ Python-3.0a1/Doc/install/index.rst 2007-09-02 19:56:49.956516585 +0200
-@@ -370,12 +370,12 @@
++++ Python-3.0a1/Doc/install/index.rst 2007-09-02 20:58:24.482002357 +0200
+@@ -366,16 +366,16 @@
+ them to go in :file:`/usr/local/lib/python2.{X}` rather than
+ :file:`/usr/lib/python2.{X}`. This can be done with ::
+
+- /usr/bin/python setup.py install --prefix=/usr/local
++ /usr/bin/python3.0 setup.py install --prefix=/usr/local
Another possibility is a network filesystem where the name used to write to a
remote directory is different from the name used to read it: for example, the
-Python interpreter accessed as :file:`/usr/local/bin/python` might search for
-+Python interpreter accessed as :file:`/usr/bin/python` might search for
++Python interpreter accessed as :file:`/usr/bin/python3.0` might search for
modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to
be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could
be done with ::
- /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
-+ /usr/bin/python setup.py install --prefix=/mnt/@server/export
++ /usr/bin/python3.0 setup.py install --prefix=/mnt/@server/export
In either case, the :option:`--prefix` option defines the installation base, and
the :option:`--exec-prefix` option defines the platform-specific installation
diff -urN Python-3.0a1.org/Doc/library/cgi.rst Python-3.0a1/Doc/library/cgi.rst
--- Python-3.0a1.org/Doc/library/cgi.rst 2007-08-17 02:23:42.000000000 +0200
-+++ Python-3.0a1/Doc/library/cgi.rst 2007-09-02 19:56:49.936515450 +0200
++++ Python-3.0a1/Doc/library/cgi.rst 2007-09-02 20:58:24.486002587 +0200
@@ -409,7 +409,7 @@
first line of the script contains ``#!`` starting in column 1 followed by the
pathname of the Python interpreter, for instance::
- #!/usr/local/bin/python
-+ #!/usr/bin/python
++ #!/usr/bin/python3.0
Make sure the Python interpreter exists and is executable by "others".
diff -urN Python-3.0a1.org/Doc/library/pickle.rst Python-3.0a1/Doc/library/pickle.rst
--- Python-3.0a1.org/Doc/library/pickle.rst 2007-08-17 02:23:42.000000000 +0200
-+++ Python-3.0a1/Doc/library/pickle.rst 2007-09-02 19:56:49.944515904 +0200
++++ Python-3.0a1/Doc/library/pickle.rst 2007-09-02 20:58:24.490002817 +0200
@@ -717,7 +717,7 @@
reading resumes from the last location. The :meth:`__setstate__` and
:meth:`__getstate__` methods are used to implement this behavior. ::
- #!/usr/local/bin/python
-+ #!/usr/bin/python
++ #!/usr/bin/python3.0
class TextReader:
"""Print and number lines in a text file."""
>>> obj = TextReader.TextReader("TextReader.py")
>>> obj.readline()
- '1: #!/usr/local/bin/python'
-+ '1: #!/usr/bin/python'
++ '1: #!/usr/bin/python3.0'
>>> obj.readline()
'2: '
>>> obj.readline()
+diff -urN Python-3.0a1.org/Doc/README.txt Python-3.0a1/Doc/README.txt
+--- Python-3.0a1.org/Doc/README.txt 2007-08-31 01:06:19.000000000 +0200
++++ Python-3.0a1/Doc/README.txt 2007-09-02 20:58:24.494003047 +0200
+@@ -37,7 +37,7 @@
+ 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.02.5
+
+ Available make targets are:
+
diff -urN Python-3.0a1.org/Doc/tutorial/interpreter.rst Python-3.0a1/Doc/tutorial/interpreter.rst
--- Python-3.0a1.org/Doc/tutorial/interpreter.rst 2007-08-17 02:23:34.000000000 +0200
-+++ Python-3.0a1/Doc/tutorial/interpreter.rst 2007-09-02 19:56:49.932515223 +0200
++++ Python-3.0a1/Doc/tutorial/interpreter.rst 2007-09-02 20:58:24.498003277 +0200
@@ -10,7 +10,7 @@
Invoking the Interpreter
========================
-The Python interpreter is usually installed as :file:`/usr/local/bin/python` on
-+The Python interpreter is usually installed as :file:`/usr/bin/python` on
++The Python interpreter is usually installed as :file:`/usr/bin/python3.0` on
those machines where it is available; putting :file:`/usr/local/bin` in your
Unix shell's search path makes it possible to start it by typing the command ::
diff -urN Python-3.0a1.org/Lib/cgi.py Python-3.0a1/Lib/cgi.py
--- Python-3.0a1.org/Lib/cgi.py 2007-08-31 01:06:20.000000000 +0200
-+++ Python-3.0a1/Lib/cgi.py 2007-09-02 19:56:49.968517266 +0200
++++ Python-3.0a1/Lib/cgi.py 2007-09-02 20:58:24.502003507 +0200
@@ -1,6 +1,6 @@
-#! /usr/local/bin/python
-+#! /usr/bin/python
++#! /usr/bin/python3.0
-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
-+# NOTE: the above "/usr/bin/python" is NOT a mistake. It is
++# NOTE: the above "/usr/bin/python3.0" 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
+diff -urN Python-3.0a1.org/Lib/distutils/tests/test_build_scripts.py Python-3.0a1/Lib/distutils/tests/test_build_scripts.py
+--- Python-3.0a1.org/Lib/distutils/tests/test_build_scripts.py 2006-10-25 00:27:19.000000000 +0200
++++ Python-3.0a1/Lib/distutils/tests/test_build_scripts.py 2007-09-02 20:58:24.502003507 +0200
+@@ -58,7 +58,7 @@
+ "pass\n"))
+ expected.append("script2.py")
+ self.write_script(dir, "script2.py",
+- ("#!/usr/bin/python\n"
++ ("#!/usr/bin/python3.0\n"
+ "# bogus script w/ Python sh-bang\n"
+ "pass\n"))
+ expected.append("shell.sh")
+diff -urN Python-3.0a1.org/Lib/distutils/tests/test_install_scripts.py Python-3.0a1/Lib/distutils/tests/test_install_scripts.py
+--- Python-3.0a1.org/Lib/distutils/tests/test_install_scripts.py 2006-10-25 00:27:19.000000000 +0200
++++ Python-3.0a1/Lib/distutils/tests/test_install_scripts.py 2007-09-02 20:58:24.506003737 +0200
+@@ -48,7 +48,7 @@
+ 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.0\n"
+ "# bogus script w/ Python sh-bang\n"
+ "pass\n"))
+ write_script("shell.sh", ("#!/bin/sh\n"
+diff -urN Python-3.0a1.org/Lib/plat-mac/bundlebuilder.py Python-3.0a1/Lib/plat-mac/bundlebuilder.py
+--- Python-3.0a1.org/Lib/plat-mac/bundlebuilder.py 2007-08-23 02:07:08.000000000 +0200
++++ Python-3.0a1/Lib/plat-mac/bundlebuilder.py 2007-09-02 20:58:24.510003967 +0200
+@@ -500,8 +500,8 @@
+ makedirs(execdir)
+ if self.standalone or self.semi_standalone:
+ # XXX we're screwed when the end user has deleted
+- # /usr/bin/python
+- hashbang = "/usr/bin/python"
++ # /usr/bin/python3.0
++ hashbang = "/usr/bin/python3.0"
+ elif self.python:
+ hashbang = self.python
+ else:
+diff -urN Python-3.0a1.org/Lib/test/test_bz2.py Python-3.0a1/Lib/test/test_bz2.py
+--- Python-3.0a1.org/Lib/test/test_bz2.py 2007-08-17 05:42:15.000000000 +0200
++++ Python-3.0a1/Lib/test/test_bz2.py 2007-09-02 20:58:24.514004197 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3.0
+ from test import test_support
+ from test.test_support import TESTFN
+
+diff -urN Python-3.0a1.org/Lib/test/test_optparse.py Python-3.0a1/Lib/test/test_optparse.py
+--- Python-3.0a1.org/Lib/test/test_optparse.py 2007-08-20 20:40:57.000000000 +0200
++++ Python-3.0a1/Lib/test/test_optparse.py 2007-09-02 20:58:24.522004657 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3.0
+
+ #
+ # Test suite for Optik. Supplied by Johannes Gijsbers
+diff -urN Python-3.0a1.org/Mac/BuildScript/build-installer.py Python-3.0a1/Mac/BuildScript/build-installer.py
+--- Python-3.0a1.org/Mac/BuildScript/build-installer.py 2007-08-31 01:14:39.000000000 +0200
++++ Python-3.0a1/Mac/BuildScript/build-installer.py 2007-09-02 20:58:24.526004887 +0200
+@@ -1,11 +1,11 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python3.02.3
+ """
+ This script is used to build the "official unofficial" universal build on
+ Mac OS X. It requires Mac OS X 10.4, Xcode 2.2 and the 10.4u SDK to do its
+ work.
+
+ Please ensure that this script keeps working with Python 2.3, to avoid
+-bootstrap issues (/usr/bin/python is Python 2.3 on OSX 10.4)
++bootstrap issues (/usr/bin/python3.0 is Python 2.3 on OSX 10.4)
+
+ Usage: see USAGE variable in the script.
+ """
diff -urN Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist Python-3.0a1/Mac/PythonLauncher/factorySettings.plist
--- Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist 2006-10-25 00:26:37.000000000 +0200
-+++ Python-3.0a1/Mac/PythonLauncher/factorySettings.plist 2007-09-02 19:56:49.880512272 +0200
-@@ -10,7 +10,7 @@
++++ Python-3.0a1/Mac/PythonLauncher/factorySettings.plist 2007-09-02 20:58:24.526004887 +0200
+@@ -10,8 +10,8 @@
<false/>
<key>interpreter_list</key>
<array>
- <string>/usr/local/bin/pythonw</string>
-+ <string>/usr/bin/pythonw</string>
- <string>/usr/bin/pythonw</string>
+- <string>/usr/bin/pythonw</string>
++ <string>/usr/bin/python3.0w</string>
++ <string>/usr/bin/python3.0w</string>
<string>/sw/bin/pythonw</string>
</array>
-@@ -35,8 +35,8 @@
+ <key>honourhashbang</key>
+@@ -35,10 +35,10 @@
<false/>
<key>interpreter_list</key>
<array>
- <string>/usr/local/bin/pythonw</string>
- <string>/usr/local/bin/python</string>
-+ <string>/usr/bin/pythonw</string>
-+ <string>/usr/bin/python</string>
- <string>/usr/bin/pythonw</string>
- <string>/usr/bin/python</string>
+- <string>/usr/bin/pythonw</string>
+- <string>/usr/bin/python</string>
++ <string>/usr/bin/python3.0w</string>
++ <string>/usr/bin/python3.0</string>
++ <string>/usr/bin/python3.0w</string>
++ <string>/usr/bin/python3.0</string>
<string>/sw/bin/pythonw</string>
-@@ -63,8 +63,8 @@
+ <string>/sw/bin/python</string>
+ </array>
+@@ -63,10 +63,10 @@
<false/>
<key>interpreter_list</key>
<array>
- <string>/usr/local/bin/pythonw</string>
- <string>/usr/local/bin/python</string>
-+ <string>/usr/bin/pythonw</string>
-+ <string>/usr/bin/python</string>
- <string>/usr/bin/pythonw</string>
- <string>/usr/bin/python</string>
+- <string>/usr/bin/pythonw</string>
+- <string>/usr/bin/python</string>
++ <string>/usr/bin/python3.0w</string>
++ <string>/usr/bin/python3.0</string>
++ <string>/usr/bin/python3.0w</string>
++ <string>/usr/bin/python3.0</string>
<string>/sw/bin/pythonw</string>
+ <string>/sw/bin/python</string>
+ </array>
diff -urN Python-3.0a1.org/Mac/README Python-3.0a1/Mac/README
--- Python-3.0a1.org/Mac/README 2006-12-13 15:07:43.000000000 +0100
-+++ Python-3.0a1/Mac/README 2007-09-02 19:56:49.896513180 +0200
++++ Python-3.0a1/Mac/README 2007-09-02 20:58:24.530005117 +0200
@@ -128,7 +128,7 @@
to be supplied later. Some useful (but outdated) info can be found in
Mac/Demo.
-The commandline scripts /usr/local/bin/python and pythonw can be used to run
-+The commandline scripts /usr/bin/python and pythonw can be used to run
++The commandline scripts /usr/bin/python3.0 and pythonw can be used to run
non-GUI and GUI python scripts from the command line, respectively.
How do I create a binary distribution?
diff -urN Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html
--- Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2006-10-25 00:26:42.000000000 +0200
-+++ Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2007-09-02 19:56:49.892512953 +0200
++++ Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2007-09-02 20:58:24.530005117 +0200
@@ -17,7 +17,7 @@
</td>
<td>
<p>MacPython 2.3 installs a perfectly normal Unix commandline
- python interpreter in <tt>/usr/local/bin/python</tt>. As of Mac OS X 10.2, however,
-+ python interpreter in <tt>/usr/bin/python</tt>. As of Mac OS X 10.2, however,
++ python interpreter in <tt>/usr/bin/python3.0</tt>. As of Mac OS X 10.2, however,
<tt>/usr/local/bin</tt> is not on the search path of your shell. Moreover,
Apple's python 2.2, which lives in <tt>/usr/bin</tt> <em>is</em> on your
search path, so this can lead to confusion.</p>
diff -urN Python-3.0a1.org/Mac/scripts/zappycfiles.py Python-3.0a1/Mac/scripts/zappycfiles.py
--- Python-3.0a1.org/Mac/scripts/zappycfiles.py 2007-08-31 01:06:18.000000000 +0200
-+++ Python-3.0a1/Mac/scripts/zappycfiles.py 2007-09-02 19:56:49.892512953 +0200
++++ Python-3.0a1/Mac/scripts/zappycfiles.py 2007-09-02 20:58:24.534005347 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
-+#!/usr/bin/python
++#!/usr/bin/python3.0
"""Recursively zap all .pyc and .pyo files"""
import os
import sys
+diff -urN Python-3.0a1.org/Mac/Tools/fixapplepython23.py Python-3.0a1/Mac/Tools/fixapplepython23.py
+--- Python-3.0a1.org/Mac/Tools/fixapplepython23.py 2007-08-31 01:06:18.000000000 +0200
++++ Python-3.0a1/Mac/Tools/fixapplepython23.py 2007-09-02 20:58:24.534005347 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3.0
+ """fixapplepython23 - Fix Apple-installed Python 2.3 (on Mac OS X 10.3)
+
+ Python 2.3 (and 2.3.X for X<5) have the problem that building an extension
diff -urN Python-3.0a1.org/Misc/HISTORY Python-3.0a1/Misc/HISTORY
--- Python-3.0a1.org/Misc/HISTORY 2007-08-16 18:30:26.000000000 +0200
-+++ Python-3.0a1/Misc/HISTORY 2007-09-02 19:56:49.872511818 +0200
++++ Python-3.0a1/Misc/HISTORY 2007-09-02 20:58:24.594008798 +0200
@@ -11092,9 +11092,9 @@
were invoked.
- It is now recommended to use ``#!/usr/bin/env python'' instead of
-``#!/usr/local/bin/python'' at the start of executable scripts, except
-+``#!/usr/bin/python'' at the start of executable scripts, except
++``#!/usr/bin/python3.0'' at the start of executable scripts, except
for CGI scripts. It has been determined that the use of /usr/bin/env
-is more portable than that of /usr/local/bin/python -- scripts almost
-+is more portable than that of /usr/bin/python -- scripts almost
++is more portable than that of /usr/bin/python3.0 -- scripts almost
never have to be edited when the Python interpreter lives in a
non-standard place. Note that this doesn't work for CGI scripts since
the python executable often doesn't live in the HTTP server's default
The interpreter is now generally assumed to live in
-/usr/local/bin/python (as opposed to /usr/local/python). The script
-+/usr/bin/python (as opposed to /usr/local/python). The script
++/usr/bin/python3.0 (as opposed to /usr/local/python). The script
demo/scripts/fixps.py will update old scripts in place (you can easily
modify it to do other similar changes).
diff -urN Python-3.0a1.org/Misc/RPM/python-2.6.spec Python-3.0a1/Misc/RPM/python-2.6.spec
--- Python-3.0a1.org/Misc/RPM/python-2.6.spec 2006-10-25 00:26:34.000000000 +0200
-+++ Python-3.0a1/Misc/RPM/python-2.6.spec 2007-09-02 19:56:49.676500697 +0200
++++ Python-3.0a1/Misc/RPM/python-2.6.spec 2007-09-02 20:58:24.598009028 +0200
@@ -150,10 +150,10 @@
* Sat Mar 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-3pydotorg]
- Being more agressive about finding the paths to fix for
- #!/usr/local/bin/python.
-+ #!/usr/bin/python.
++ #!/usr/bin/python3.0.
* Sat Feb 07 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.3-2pydotorg]
-- Adding code to remove "#!/usr/local/bin/python" from particular files and
-+- Adding code to remove "#!/usr/bin/python" from particular files and
++- Adding code to remove "#!/usr/bin/python3.0" from particular files and
causing the RPM build to terminate if there are any unexpected files
which have that line in them.
# fix the #! line in installed files
find "$RPM_BUILD_ROOT" -type f -print0 |
- xargs -0 grep -l /usr/local/bin/python | while read file
-+ xargs -0 grep -l /usr/bin/python | while read file
++ xargs -0 grep -l /usr/bin/python3.0 | while read file
do
FIXFILE="$file"
sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
# check to see if there are any straggling #! lines
-find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
-+find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python' \
++find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python3.0' \
| grep ':1:#!' >/tmp/python-rpm-files.$$ || true
if [ -s /tmp/python-rpm-files.$$ ]
then
cat <<@EOF
*****************************************************
- There are still files referencing /usr/local/bin/python in the
-+ There are still files referencing /usr/bin/python in the
++ There are still files referencing /usr/bin/python3.0 in the
install directory. They are listed above. Please fix the .spec
file and try again. If you are an end-user, you probably want
to report this to jafo-rpms@tummy.com as well.
+diff -urN Python-3.0a1.org/Modules/getpath.c Python-3.0a1/Modules/getpath.c
+--- Python-3.0a1.org/Modules/getpath.c 2007-05-03 01:01:29.000000000 +0200
++++ Python-3.0a1/Modules/getpath.c 2007-09-02 20:58:24.614009948 +0200
+@@ -405,7 +405,7 @@
+ * "#!/opt/python2.3/bin/python", the kernel only passes "python"
+ * as argv[0], which falls through to the $PATH search below.
+ * If /opt/python2.3/bin isn't in your path, or is near the end,
+- * this algorithm may incorrectly find /usr/bin/python. To work
++ * this algorithm may incorrectly find /usr/bin/python3.0. To work
+ * around this, we can use _NSGetExecutablePath to get a better
+ * hint of what the intended interpreter was, although this
+ * will fail if a relative path was used. but in that case,
+diff -urN Python-3.0a1.org/PC/os2vacpp/readme.txt Python-3.0a1/PC/os2vacpp/readme.txt
+--- Python-3.0a1.org/PC/os2vacpp/readme.txt 2006-10-25 00:26:50.000000000 +0200
++++ Python-3.0a1/PC/os2vacpp/readme.txt 2007-09-02 20:58:24.618010178 +0200
+@@ -78,7 +78,7 @@
+ -- Using Python as the Default OS/2 Batch Language
+
+ Note that OS/2 supports the Unix technique of putting the special
+-comment line at the time of scripts e.g. "#!/usr/bin/python" in
++comment line at the time of scripts e.g. "#!/usr/bin/python3.0" in
+ a different syntactic form. To do this, put your script into a file
+ with a .CMD extension and added 'extproc' to the top as follows:
+
diff -urN Python-3.0a1.org/Tools/faqwiz/faqw.py Python-3.0a1/Tools/faqwiz/faqw.py
--- Python-3.0a1.org/Tools/faqwiz/faqw.py 2007-08-03 22:42:22.000000000 +0200
-+++ Python-3.0a1/Tools/faqwiz/faqw.py 2007-09-02 19:56:49.916514315 +0200
++++ Python-3.0a1/Tools/faqwiz/faqw.py 2007-09-02 20:58:24.618010178 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
-+#! /usr/bin/python
++#! /usr/bin/python3.0
"""FAQ wizard bootstrap."""
# You need to edit the first line and the lines that define FAQDIR and
-# SRCDIR, below: change /usr/local/bin/python to where your Python
-+# SRCDIR, below: change /usr/bin/python to where your Python
++# SRCDIR, below: change /usr/bin/python3.0 to where your Python
# interpreter lives, change the value for FAQDIR to where your FAQ
# lives, and change the value for SRCDIR to where your faqwiz.py
# module lives. The faqconf.py and faqcust.py files live there, too.
diff -urN Python-3.0a1.org/Tools/pybench/pybench.py Python-3.0a1/Tools/pybench/pybench.py
--- Python-3.0a1.org/Tools/pybench/pybench.py 2007-08-03 22:42:22.000000000 +0200
-+++ Python-3.0a1/Tools/pybench/pybench.py 2007-09-02 19:56:49.908513861 +0200
++++ Python-3.0a1/Tools/pybench/pybench.py 2007-09-02 20:58:24.622010408 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -O
-+#!/usr/bin/python -O
++#!/usr/bin/python3.0 -O
""" A Python Benchmark Suite
diff -urN Python-3.0a1.org/Tools/pybench/README Python-3.0a1/Tools/pybench/README
--- Python-3.0a1.org/Tools/pybench/README 2006-10-25 00:26:47.000000000 +0200
-+++ Python-3.0a1/Tools/pybench/README 2007-09-02 19:56:49.912514088 +0200
++++ Python-3.0a1/Tools/pybench/README 2007-09-02 20:58:24.626010638 +0200
@@ -141,7 +141,7 @@
Processor: x86_64
Python:
- Executable: /usr/local/bin/python
-+ Executable: /usr/bin/python
++ Executable: /usr/bin/python3.0
Version: 2.4.2
Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
Bits: 64bit
diff -urN Python-3.0a1.org/Tools/scripts/fixps.py Python-3.0a1/Tools/scripts/fixps.py
--- Python-3.0a1.org/Tools/scripts/fixps.py 2007-08-03 22:42:22.000000000 +0200
-+++ Python-3.0a1/Tools/scripts/fixps.py 2007-09-02 19:56:49.900513407 +0200
++++ Python-3.0a1/Tools/scripts/fixps.py 2007-09-02 20:58:24.626010638 +0200
@@ -15,13 +15,13 @@
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/python', line):
-+ print(filename, ': not a /usr/bin/python script')
++ if not re.match('^#! */usr/bin/python3.0', line):
++ print(filename, ': not a /usr/bin/python3.0 script')
f.close()
continue
rest = f.read()
f.close()
- line = re.sub('/usr/local/bin/python',
-+ line = re.sub('/usr/bin/python',
++ line = re.sub('/usr/bin/python3.0',
'/usr/bin/env python', line)
print(filename, ':', repr(line))
f = open(filename, "w")
diff -urN Python-3.0a1.org/Tools/scripts/parseentities.py Python-3.0a1/Tools/scripts/parseentities.py
--- Python-3.0a1.org/Tools/scripts/parseentities.py 2006-10-25 00:26:46.000000000 +0200
-+++ Python-3.0a1/Tools/scripts/parseentities.py 2007-09-02 19:56:49.896513180 +0200
++++ Python-3.0a1/Tools/scripts/parseentities.py 2007-09-02 20:58:24.630010868 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
-+#!/usr/bin/python
++#!/usr/bin/python3.0
""" Utility for parsing HTML entity definitions available from:
http://www.w3.org/ as e.g.
diff -urN Python-3.0a1.org/Tools/scripts/README Python-3.0a1/Tools/scripts/README
--- Python-3.0a1.org/Tools/scripts/README 2006-10-25 00:26:46.000000000 +0200
-+++ Python-3.0a1/Tools/scripts/README 2007-09-02 19:56:49.904513634 +0200
++++ Python-3.0a1/Tools/scripts/README 2007-09-02 20:58:24.630010868 +0200
@@ -45,7 +45,7 @@
nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
objgraph.py Print object graph from nm output on a library
parseentities.py Utility for parsing HTML entity definitions
-pathfix.py Change #!/usr/local/bin/python into something else
-+pathfix.py Change #!/usr/bin/python into something else
++pathfix.py Change #!/usr/bin/python3.0 into something else
pdeps.py Print dependencies between Python modules
pickle2db.py Load a pickle generated by db2pickle.py to a database
pindent.py Indent Python code, giving block-closing comments
projects / packages / python3.git / commitdiff