-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 @@
- <false/>
- <key>interpreter_list</key>
- <array>
-- <string>/usr/local/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>
- <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/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>
-@@ -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/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 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/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 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/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 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 <jafo-rpms@tummy.com> [2.3.2-3pydotorg]
- - Being more agressive about finding the paths to fix for
-- #!/usr/local/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/python3.0" from particular files and
- causing the RPM build to terminate if there are any unexpected files
- which have that line in them.
-
-@@ -296,7 +296,7 @@
-
- # 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/python3.0 | while read file
- do
- FIXFILE="$file"
- sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
-@@ -306,7 +306,7 @@
- done
-
- # 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/python3.0' \
- | grep ':1:#!' >/tmp/python-rpm-files.$$ || true
- if [ -s /tmp/python-rpm-files.$$ ]
- then
-@@ -314,7 +314,7 @@
- cat /tmp/python-rpm-files.$$
- cat <<@EOF
- *****************************************************
-- There are still files referencing /usr/local/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 20:58:24.618010178 +0200
-@@ -1,4 +1,4 @@