1 --- Python-3.0.1/Modules/getpath.c.wiget 2009-02-12 16:56:48.000000000 +0100
2 +++ Python-3.0.1/Modules/getpath.c 2009-02-25 17:23:09.000000000 +0100
3 @@ -481,7 +481,7 @@ calculate_path(void)
4 * "#!/opt/python2.3/bin/python", the kernel only passes "python"
5 * as argv[0], which falls through to the $PATH search below.
6 * If /opt/python2.3/bin isn't in your path, or is near the end,
7 - * this algorithm may incorrectly find /usr/bin/python. To work
8 + * this algorithm may incorrectly find /usr/bin/python3.0. To work
9 * around this, we can use _NSGetExecutablePath to get a better
10 * hint of what the intended interpreter was, although this
11 * will fail if a relative path was used. but in that case,
12 --- Python-3.0.1/Lib/distutils/tests/test_build_scripts.py.wiget 2004-08-26 07:44:02.000000000 +0200
13 +++ Python-3.0.1/Lib/distutils/tests/test_build_scripts.py 2009-02-25 17:23:09.000000000 +0100
14 @@ -58,7 +58,7 @@ class BuildScriptsTestCase(support.Tempd
16 expected.append("script2.py")
17 self.write_script(dir, "script2.py",
18 - ("#!/usr/bin/python\n"
19 + ("#!/usr/bin/python3.0\n"
20 "# bogus script w/ Python sh-bang\n"
22 expected.append("shell.sh")
23 --- Python-3.0.1/Lib/distutils/tests/test_install_scripts.py.wiget 2004-08-03 20:53:07.000000000 +0200
24 +++ Python-3.0.1/Lib/distutils/tests/test_install_scripts.py 2009-02-25 17:23:09.000000000 +0100
25 @@ -48,7 +48,7 @@ class InstallScriptsTestCase(support.Tem
26 write_script("script1.py", ("#! /usr/bin/env python2.3\n"
27 "# bogus script w/ Python sh-bang\n"
29 - write_script("script2.py", ("#!/usr/bin/python\n"
30 + write_script("script2.py", ("#!/usr/bin/python3.0\n"
31 "# bogus script w/ Python sh-bang\n"
33 write_script("shell.sh", ("#!/bin/sh\n"
34 --- Python-3.0.1/Lib/test/test_optparse.py.wiget 2008-05-20 23:35:26.000000000 +0200
35 +++ Python-3.0.1/Lib/test/test_optparse.py 2009-02-25 17:23:09.000000000 +0100
41 # Test suite for Optik. Supplied by Johannes Gijsbers
42 --- Python-3.0.1/Lib/test/test_bz2.py.wiget 2008-07-16 05:43:04.000000000 +0200
43 +++ Python-3.0.1/Lib/test/test_bz2.py 2009-02-25 17:28:56.000000000 +0100
47 from test import support
48 from test.support import TESTFN
50 --- Python-3.0.1/Lib/cgi.py.wiget 2008-12-04 21:11:57.000000000 +0100
51 +++ Python-3.0.1/Lib/cgi.py 2009-02-25 17:23:09.000000000 +0100
53 -#! /usr/local/bin/python
54 +#! /usr/bin/python3.0
56 -# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
57 +# NOTE: the above "/usr/bin/python3.0" is NOT a mistake. It is
58 # intentionally NOT "/usr/bin/env python". On many systems
59 # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
60 # scripts, and /usr/local/bin is the default directory where Python is
61 --- Python-3.0.1/Demo/cgi/cgi2.py.wiget 2007-08-06 23:07:53.000000000 +0200
62 +++ Python-3.0.1/Demo/cgi/cgi2.py 2009-02-25 17:23:09.000000000 +0100
64 -#!/usr/local/bin/python
67 """CGI test 2 - basic use of cgi module."""
69 --- Python-3.0.1/Demo/cgi/cgi1.py.wiget 2007-07-17 22:59:35.000000000 +0200
70 +++ Python-3.0.1/Demo/cgi/cgi1.py 2009-02-25 17:23:09.000000000 +0100
72 -#!/usr/local/bin/python
75 """CGI test 1 - check server setup."""
77 --- Python-3.0.1/Demo/cgi/cgi3.py.wiget 2002-10-17 17:53:02.000000000 +0200
78 +++ Python-3.0.1/Demo/cgi/cgi3.py 2009-02-25 17:23:09.000000000 +0100
80 -#!/usr/local/bin/python
83 """CGI test 3 (persistent data)."""
85 --- Python-3.0.1/Demo/tix/INSTALL.txt.wiget 2001-11-11 15:07:37.000000000 +0100
86 +++ Python-3.0.1/Demo/tix/INSTALL.txt 2009-02-25 17:23:09.000000000 +0100
87 @@ -71,7 +71,7 @@ _tkinter _tkinter.c tkappinit.c -DWITH_A
88 You should now have a working Tix implementation in Python. To see if all
89 is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
91 - /usr/local/bin/python Demo/tix/tixwidgets.py
92 + /usr/bin/python3.0 Demo/tix/tixwidgets.py
94 If this does not work, you may need to tell python where to find
95 the Tcl, Tk and Tix library files. This is done by setting the
96 @@ -80,7 +80,7 @@ TCL_LIBRARY, TK_LIBRARY and TIX_LIBRARY
97 env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
98 TK_LIBRARY=/usr/local/lib/tk8.3 \
99 TIX_LIBRARY=/usr/local/lib/tix8.1 \
100 - /usr/local/bin/python Demo/tix/tixwidgets.py
101 + /usr/bin/python3.0 Demo/tix/tixwidgets.py
104 If you find any bugs or have suggestions for improvement, please report them
105 --- Python-3.0.1/Tools/faqwiz/faqw.py.wiget 2008-02-23 19:30:17.000000000 +0100
106 +++ Python-3.0.1/Tools/faqwiz/faqw.py 2009-02-25 17:23:09.000000000 +0100
108 -#! /usr/local/bin/python
109 +#! /usr/bin/python3.0
111 """FAQ wizard bootstrap."""
116 # You need to edit the first line and the lines that define FAQDIR and
117 -# SRCDIR, below: change /usr/local/bin/python to where your Python
118 +# SRCDIR, below: change /usr/bin/python3.0 to where your Python
119 # interpreter lives, change the value for FAQDIR to where your FAQ
120 # lives, and change the value for SRCDIR to where your faqwiz.py
121 # module lives. The faqconf.py and faqcust.py files live there, too.
122 --- Python-3.0.1/Tools/pybench/README.wiget 2009-02-07 18:28:46.000000000 +0100
123 +++ Python-3.0.1/Tools/pybench/README 2009-02-25 17:29:43.000000000 +0100
124 @@ -142,7 +142,7 @@ Benchmark: 2006-06-12 12:09:25
127 Implementation: CPython
128 - Executable: /usr/local/bin/python
129 + Executable: /usr/bin/python3.0
131 Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
133 --- Python-3.0.1/Tools/pybench/pybench.py.wiget 2009-02-07 18:28:46.000000000 +0100
134 +++ Python-3.0.1/Tools/pybench/pybench.py 2009-02-25 17:23:09.000000000 +0100
136 -#!/usr/local/bin/python -O
137 +#!/usr/bin/python3.0 -O
139 """ A Python Benchmark Suite
141 --- Python-3.0.1/Tools/scripts/README.wiget 2007-10-13 20:56:00.000000000 +0200
142 +++ Python-3.0.1/Tools/scripts/README 2009-02-25 17:23:09.000000000 +0100
143 @@ -44,7 +44,7 @@ ndiff.py Intelligent diff between text
144 nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
145 objgraph.py Print object graph from nm output on a library
146 parseentities.py Utility for parsing HTML entity definitions
147 -pathfix.py Change #!/usr/local/bin/python into something else
148 +pathfix.py Change #!/usr/bin/python3.0 into something else
149 pdeps.py Print dependencies between Python modules
150 pickle2db.py Load a pickle generated by db2pickle.py to a database
151 pindent.py Indent Python code, giving block-closing comments
152 --- Python-3.0.1/Tools/scripts/parseentities.py.wiget 2008-05-16 17:23:30.000000000 +0200
153 +++ Python-3.0.1/Tools/scripts/parseentities.py 2009-02-25 17:23:09.000000000 +0100
155 -#!/usr/local/bin/python
156 +#!/usr/bin/python3.0
157 """ Utility for parsing HTML entity definitions available from:
159 http://www.w3.org/ as e.g.
160 --- Python-3.0.1/Tools/scripts/fixps.py.wiget 2007-08-03 19:06:41.000000000 +0200
161 +++ Python-3.0.1/Tools/scripts/fixps.py 2009-02-25 17:23:09.000000000 +0100
162 @@ -15,13 +15,13 @@ def main():
163 print(filename, ': can\'t open :', msg)
166 - if not re.match('^#! */usr/local/bin/python', line):
167 - print(filename, ': not a /usr/local/bin/python script')
168 + if not re.match('^#! */usr/bin/python3.0', line):
169 + print(filename, ': not a /usr/bin/python3.0 script')
174 - line = re.sub('/usr/local/bin/python',
175 + line = re.sub('/usr/bin/python3.0',
176 '/usr/bin/env python', line)
177 print(filename, ':', repr(line))
178 f = open(filename, "w")
179 --- Python-3.0.1/Mac/README.wiget 2008-07-01 20:23:09.000000000 +0200
180 +++ Python-3.0.1/Mac/README 2009-02-25 17:23:09.000000000 +0100
181 @@ -123,7 +123,7 @@ GUI-things. Keep the "alt" key depressed
182 script to set runtime options. These options can be set once and for all
183 through PythonLauncher's preferences dialog.
185 -The commandline scripts /usr/local/bin/python and pythonw can be used to run
186 +The commandline scripts /usr/bin/python3.0 and pythonw can be used to run
187 non-GUI and GUI python scripts from the command line, respectively.
189 How do I create a binary distribution?
190 --- Python-3.0.1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html.wiget 2003-06-19 00:10:27.000000000 +0200
191 +++ Python-3.0.1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2009-02-25 17:23:09.000000000 +0100
195 <p>MacPython 2.3 installs a perfectly normal Unix commandline
196 - python interpreter in <tt>/usr/local/bin/python</tt>. As of Mac OS X 10.2, however,
197 + python interpreter in <tt>/usr/bin/python3.0</tt>. As of Mac OS X 10.2, however,
198 <tt>/usr/local/bin</tt> is not on the search path of your shell. Moreover,
199 Apple's python 2.2, which lives in <tt>/usr/bin</tt> <em>is</em> on your
200 search path, so this can lead to confusion.</p>
201 --- Python-3.0.1/Mac/BuildScript/build-installer.py.wiget 2009-02-12 17:09:09.000000000 +0100
202 +++ Python-3.0.1/Mac/BuildScript/build-installer.py 2009-02-25 17:23:09.000000000 +0100
204 -#!/usr/bin/python2.3
205 +#!/usr/bin/python3.02.3
207 This script is used to build the "official unofficial" universal build on
208 Mac OS X. It requires Mac OS X 10.4, Xcode 2.2 and the 10.4u SDK to do its
211 Please ensure that this script keeps working with Python 2.3, to avoid
212 -bootstrap issues (/usr/bin/python is Python 2.3 on OSX 10.4)
213 +bootstrap issues (/usr/bin/python3.0 is Python 2.3 on OSX 10.4)
215 Usage: see USAGE variable in the script.
217 --- Python-3.0.1/Mac/Tools/fixapplepython23.py.wiget 2008-12-30 21:19:21.000000000 +0100
218 +++ Python-3.0.1/Mac/Tools/fixapplepython23.py 2009-02-25 17:23:09.000000000 +0100
221 +#!/usr/bin/python3.0
222 """fixapplepython23 - Fix Apple-installed Python 2.3 (on Mac OS X 10.3)
224 Python 2.3 (and 2.3.X for X<5) have the problem that building an extension
225 --- Python-3.0.1/Mac/PythonLauncher/factorySettings.plist.wiget 2004-07-16 14:34:23.000000000 +0200
226 +++ Python-3.0.1/Mac/PythonLauncher/factorySettings.plist 2009-02-25 17:23:09.000000000 +0100
229 <key>interpreter_list</key>
231 - <string>/usr/local/bin/pythonw</string>
232 - <string>/usr/bin/pythonw</string>
233 + <string>/usr/bin/python3.0w</string>
234 + <string>/usr/bin/python3.0w</string>
235 <string>/sw/bin/pythonw</string>
237 <key>honourhashbang</key>
240 <key>interpreter_list</key>
242 - <string>/usr/local/bin/pythonw</string>
243 - <string>/usr/local/bin/python</string>
244 - <string>/usr/bin/pythonw</string>
245 - <string>/usr/bin/python</string>
246 + <string>/usr/bin/python3.0w</string>
247 + <string>/usr/bin/python3.0</string>
248 + <string>/usr/bin/python3.0w</string>
249 + <string>/usr/bin/python3.0</string>
250 <string>/sw/bin/pythonw</string>
251 <string>/sw/bin/python</string>
255 <key>interpreter_list</key>
257 - <string>/usr/local/bin/pythonw</string>
258 - <string>/usr/local/bin/python</string>
259 - <string>/usr/bin/pythonw</string>
260 - <string>/usr/bin/python</string>
261 + <string>/usr/bin/python3.0w</string>
262 + <string>/usr/bin/python3.0</string>
263 + <string>/usr/bin/python3.0w</string>
264 + <string>/usr/bin/python3.0</string>
265 <string>/sw/bin/pythonw</string>
266 <string>/sw/bin/python</string>
268 --- Python-3.0.1/Doc/install/index.rst.wiget 2009-01-04 01:09:41.000000000 +0100
269 +++ Python-3.0.1/Doc/install/index.rst 2009-02-25 17:23:09.000000000 +0100
270 @@ -362,16 +362,16 @@ However, if you are installing Python mo
271 them to go in :file:`/usr/local/lib/python2.{X}` rather than
272 :file:`/usr/lib/python2.{X}`. This can be done with ::
274 - /usr/bin/python setup.py install --prefix=/usr/local
275 + /usr/bin/python3.0 setup.py install --prefix=/usr/local
277 Another possibility is a network filesystem where the name used to write to a
278 remote directory is different from the name used to read it: for example, the
279 -Python interpreter accessed as :file:`/usr/local/bin/python` might search for
280 +Python interpreter accessed as :file:`/usr/bin/python3.0` might search for
281 modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to
282 be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could
285 - /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
286 + /usr/bin/python3.0 setup.py install --prefix=/mnt/@server/export
288 In either case, the :option:`--prefix` option defines the installation base, and
289 the :option:`--exec-prefix` option defines the platform-specific installation
290 --- Python-3.0.1/Doc/README.txt.wiget 2009-02-13 00:46:00.000000000 +0100
291 +++ Python-3.0.1/Doc/README.txt 2009-02-25 17:23:09.000000000 +0100
292 @@ -37,7 +37,7 @@ the top-level index `build/html/index.ht
293 To use a Python interpreter that's not called ``python``, use the standard
294 way to set Makefile variables, using e.g. ::
296 - make html PYTHON=/usr/bin/python2.5
297 + make html PYTHON=/usr/bin/python3.02.5
299 Available make targets are:
301 --- Python-3.0.1/Doc/tutorial/interpreter.rst.wiget 2009-01-04 01:04:26.000000000 +0100
302 +++ Python-3.0.1/Doc/tutorial/interpreter.rst 2009-02-25 17:28:11.000000000 +0100
303 @@ -10,8 +10,8 @@ Using the Python Interpreter
304 Invoking the Interpreter
305 ========================
307 -The Python interpreter is usually installed as :file:`/usr/local/bin/python3.0`
308 -on those machines where it is available; putting :file:`/usr/local/bin` in your
309 +The Python interpreter is usually installed as :file:`/usr/bin/python3.0`
310 +on those machines where it is available; putting :file:`/usr/bin` in your
311 Unix shell's search path makes it possible to start it by typing the command ::
314 --- Python-3.0.1/Doc/c-api/init.rst.wiget 2009-02-06 03:50:18.000000000 +0100
315 +++ Python-3.0.1/Doc/c-api/init.rst 2009-02-25 17:23:09.000000000 +0100
316 @@ -194,7 +194,7 @@ Initialization, Finalization, and Thread
317 Return the *prefix* for installed platform-independent files. This is derived
318 through a number of complicated rules from the program name set with
319 :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
320 - program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
321 + program name is ``'/usr/bin/python3.0'``, the prefix is ``'/usr/local'``. The
322 returned string points into static storage; the caller should not modify its
323 value. This corresponds to the :makevar:`prefix` variable in the top-level
324 :file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
325 @@ -207,7 +207,7 @@ Initialization, Finalization, and Thread
326 Return the *exec-prefix* for installed platform-*dependent* files. This is
327 derived through a number of complicated rules from the program name set with
328 :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
329 - program name is ``'/usr/local/bin/python'``, the exec-prefix is
330 + program name is ``'/usr/bin/python3.0'``, the exec-prefix is
331 ``'/usr/local'``. The returned string points into static storage; the caller
332 should not modify its value. This corresponds to the :makevar:`exec_prefix`
333 variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
334 --- Python-3.0.1/Doc/c-api/intro.rst.wiget 2009-01-17 19:00:58.000000000 +0100
335 +++ Python-3.0.1/Doc/c-api/intro.rst 2009-02-25 17:23:09.000000000 +0100
336 @@ -536,7 +536,7 @@ where the executable named :file:`python
337 path (the environment variable :envvar:`PATH`).
339 For instance, if the Python executable is found in
340 -:file:`/usr/local/bin/python`, it will assume that the libraries are in
341 +:file:`/usr/bin/python3.0`, it will assume that the libraries are in
342 :file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
343 the "fallback" location, used when no executable file named :file:`python` is
344 found along :envvar:`PATH`.) The user can override this behavior by setting the
345 --- Python-3.0.1/Doc/library/cgi.rst.wiget 2008-09-04 00:49:01.000000000 +0200
346 +++ Python-3.0.1/Doc/library/cgi.rst 2009-02-25 17:23:09.000000000 +0100
347 @@ -360,7 +360,7 @@ mode should be ``0o755`` octal (use ``ch
348 first line of the script contains ``#!`` starting in column 1 followed by the
349 pathname of the Python interpreter, for instance::
351 - #!/usr/local/bin/python
352 + #!/usr/bin/python3.0
354 Make sure the Python interpreter exists and is executable by "others".
356 --- Python-3.0.1/PC/os2vacpp/readme.txt.wiget 2006-03-01 07:28:58.000000000 +0100
357 +++ Python-3.0.1/PC/os2vacpp/readme.txt 2009-02-25 17:23:09.000000000 +0100
358 @@ -78,7 +78,7 @@ A few new attributes have been added to
359 -- Using Python as the Default OS/2 Batch Language
361 Note that OS/2 supports the Unix technique of putting the special
362 -comment line at the time of scripts e.g. "#!/usr/bin/python" in
363 +comment line at the time of scripts e.g. "#!/usr/bin/python3.0" in
364 a different syntactic form. To do this, put your script into a file
365 with a .CMD extension and added 'extproc' to the top as follows:
367 --- Python-3.0.1/Misc/HISTORY.wiget 2008-02-22 17:37:40.000000000 +0100
368 +++ Python-3.0.1/Misc/HISTORY 2009-02-25 17:23:09.000000000 +0100
369 @@ -13231,9 +13231,9 @@ but not in sys.argv[0], so you can still
372 - It is now recommended to use ``#!/usr/bin/env python'' instead of
373 -``#!/usr/local/bin/python'' at the start of executable scripts, except
374 +``#!/usr/bin/python3.0'' at the start of executable scripts, except
375 for CGI scripts. It has been determined that the use of /usr/bin/env
376 -is more portable than that of /usr/local/bin/python -- scripts almost
377 +is more portable than that of /usr/bin/python3.0 -- scripts almost
378 never have to be edited when the Python interpreter lives in a
379 non-standard place. Note that this doesn't work for CGI scripts since
380 the python executable often doesn't live in the HTTP server's default
381 @@ -16518,7 +16518,7 @@ assign a function object to sys.exitfunc
382 Python exits or receives a SIGTERM or SIGHUP signal.
384 The interpreter is now generally assumed to live in
385 -/usr/local/bin/python (as opposed to /usr/local/python). The script
386 +/usr/bin/python3.0 (as opposed to /usr/local/python). The script
387 demo/scripts/fixps.py will update old scripts in place (you can easily
388 modify it to do other similar changes).