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 20:58:24.437999826 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/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 20:58:24.437999826 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/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 20:58:24.437999826 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/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 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/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
@@ -80,7 +80,7 @@
env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
TK_LIBRARY=/usr/local/lib/tk8.3 \
TIX_LIBRARY=/usr/local/lib/tix8.1 \
- /usr/local/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 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/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`
@@ -208,7 +208,7 @@
Return the *exec-prefix* for installed platform-*dependent* 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 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 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/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 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/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/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 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/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 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/python3.0
class TextReader:
"""Print and number lines in a text file."""
@@ -754,7 +754,7 @@
>>> import TextReader
>>> obj = TextReader.TextReader("TextReader.py")
>>> obj.readline()
- '1: #!/usr/local/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 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/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 20:58:24.502003507 +0200
@@ -1,6 +1,6 @@
-#! /usr/local/bin/python
+#! /usr/bin/python3.0
-# NOTE: the above "/usr/local/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 20:58:24.526004887 +0200
@@ -10,8 +10,8 @@
MacPython 2.3 installs a perfectly normal Unix commandline - python interpreter in /usr/local/bin/python. As of Mac OS X 10.2, however, + python interpreter in /usr/bin/python3.0. As of Mac OS X 10.2, however, /usr/local/bin is not on the search path of your shell. Moreover, Apple's python 2.2, which lives in /usr/bin is on your search path, so this can lead to confusion.
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 20:58:24.534005347 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/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 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/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/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 @@ -14379,7 +14379,7 @@ Python exits or receives a SIGTERM or SIGHUP signal. The interpreter is now generally assumed to live in -/usr/local/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 20:58:24.598009028 +0200 @@ -150,10 +150,10 @@ * Sat Mar 27 2004 Sean Reifschneider