1 diff -urN Python-3.0a1.org/Demo/cgi/cgi1.py Python-3.0a1/Demo/cgi/cgi1.py
2 --- Python-3.0a1.org/Demo/cgi/cgi1.py 2007-07-17 23:03:42.000000000 +0200
3 +++ Python-3.0a1/Demo/cgi/cgi1.py 2007-09-02 19:56:49.628497973 +0200
5 -#!/usr/local/bin/python
8 """CGI test 1 - check server setup."""
10 diff -urN Python-3.0a1.org/Demo/cgi/cgi2.py Python-3.0a1/Demo/cgi/cgi2.py
11 --- Python-3.0a1.org/Demo/cgi/cgi2.py 2007-08-06 23:21:05.000000000 +0200
12 +++ Python-3.0a1/Demo/cgi/cgi2.py 2007-09-02 19:56:49.628497973 +0200
14 -#!/usr/local/bin/python
17 """CGI test 2 - basic use of cgi module."""
19 diff -urN Python-3.0a1.org/Demo/cgi/cgi3.py Python-3.0a1/Demo/cgi/cgi3.py
20 --- Python-3.0a1.org/Demo/cgi/cgi3.py 2006-10-25 00:26:30.000000000 +0200
21 +++ Python-3.0a1/Demo/cgi/cgi3.py 2007-09-02 19:56:49.632498200 +0200
23 -#!/usr/local/bin/python
26 """CGI test 3 (persistent data)."""
28 diff -urN Python-3.0a1.org/Demo/tix/INSTALL.txt Python-3.0a1/Demo/tix/INSTALL.txt
29 --- Python-3.0a1.org/Demo/tix/INSTALL.txt 2006-10-25 00:26:31.000000000 +0200
30 +++ Python-3.0a1/Demo/tix/INSTALL.txt 2007-09-02 19:56:49.636498427 +0200
32 You should now have a working Tix implementation in Python. To see if all
33 is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
35 - /usr/local/bin/python Demo/tix/tixwidgets.py
36 + /usr/bin/python Demo/tix/tixwidgets.py
38 If this does not work, you may need to tell python where to find
39 the Tcl, Tk and Tix library files. This is done by setting the
41 env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
42 TK_LIBRARY=/usr/local/lib/tk8.3 \
43 TIX_LIBRARY=/usr/local/lib/tix8.1 \
44 - /usr/local/bin/python Demo/tix/tixwidgets.py
45 + /usr/bin/python Demo/tix/tixwidgets.py
48 If you find any bugs or have suggestions for improvement, please report them
49 diff -urN Python-3.0a1.org/Doc/c-api/init.rst Python-3.0a1/Doc/c-api/init.rst
50 --- Python-3.0a1.org/Doc/c-api/init.rst 2007-08-17 02:23:32.000000000 +0200
51 +++ Python-3.0a1/Doc/c-api/init.rst 2007-09-02 19:56:49.928514996 +0200
53 Return the *prefix* for installed platform-independent files. This is derived
54 through a number of complicated rules from the program name set with
55 :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
56 - program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
57 + program name is ``'/usr/bin/python'``, the prefix is ``'/usr/local'``. The
58 returned string points into static storage; the caller should not modify its
59 value. This corresponds to the :makevar:`prefix` variable in the top-level
60 :file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
62 Return the *exec-prefix* for installed platform-*dependent* files. This is
63 derived through a number of complicated rules from the program name set with
64 :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
65 - program name is ``'/usr/local/bin/python'``, the exec-prefix is
66 + program name is ``'/usr/bin/python'``, the exec-prefix is
67 ``'/usr/local'``. The returned string points into static storage; the caller
68 should not modify its value. This corresponds to the :makevar:`exec_prefix`
69 variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
70 diff -urN Python-3.0a1.org/Doc/c-api/intro.rst Python-3.0a1/Doc/c-api/intro.rst
71 --- Python-3.0a1.org/Doc/c-api/intro.rst 2007-08-17 02:23:32.000000000 +0200
72 +++ Python-3.0a1/Doc/c-api/intro.rst 2007-09-02 19:56:49.920514542 +0200
74 path (the environment variable :envvar:`PATH`).
76 For instance, if the Python executable is found in
77 -:file:`/usr/local/bin/python`, it will assume that the libraries are in
78 +:file:`/usr/bin/python`, it will assume that the libraries are in
79 :file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
80 the "fallback" location, used when no executable file named :file:`python` is
81 found along :envvar:`PATH`.) The user can override this behavior by setting the
82 diff -urN Python-3.0a1.org/Doc/install/index.rst Python-3.0a1/Doc/install/index.rst
83 --- Python-3.0a1.org/Doc/install/index.rst 2007-08-29 00:24:47.000000000 +0200
84 +++ Python-3.0a1/Doc/install/index.rst 2007-09-02 19:56:49.956516585 +0200
87 Another possibility is a network filesystem where the name used to write to a
88 remote directory is different from the name used to read it: for example, the
89 -Python interpreter accessed as :file:`/usr/local/bin/python` might search for
90 +Python interpreter accessed as :file:`/usr/bin/python` might search for
91 modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to
92 be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could
95 - /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
96 + /usr/bin/python setup.py install --prefix=/mnt/@server/export
98 In either case, the :option:`--prefix` option defines the installation base, and
99 the :option:`--exec-prefix` option defines the platform-specific installation
100 diff -urN Python-3.0a1.org/Doc/library/cgi.rst Python-3.0a1/Doc/library/cgi.rst
101 --- Python-3.0a1.org/Doc/library/cgi.rst 2007-08-17 02:23:42.000000000 +0200
102 +++ Python-3.0a1/Doc/library/cgi.rst 2007-09-02 19:56:49.936515450 +0200
104 first line of the script contains ``#!`` starting in column 1 followed by the
105 pathname of the Python interpreter, for instance::
107 - #!/usr/local/bin/python
110 Make sure the Python interpreter exists and is executable by "others".
112 diff -urN Python-3.0a1.org/Doc/library/pickle.rst Python-3.0a1/Doc/library/pickle.rst
113 --- Python-3.0a1.org/Doc/library/pickle.rst 2007-08-17 02:23:42.000000000 +0200
114 +++ Python-3.0a1/Doc/library/pickle.rst 2007-09-02 19:56:49.944515904 +0200
116 reading resumes from the last location. The :meth:`__setstate__` and
117 :meth:`__getstate__` methods are used to implement this behavior. ::
119 - #!/usr/local/bin/python
123 """Print and number lines in a text file."""
125 >>> import TextReader
126 >>> obj = TextReader.TextReader("TextReader.py")
128 - '1: #!/usr/local/bin/python'
129 + '1: #!/usr/bin/python'
133 diff -urN Python-3.0a1.org/Doc/tutorial/interpreter.rst Python-3.0a1/Doc/tutorial/interpreter.rst
134 --- Python-3.0a1.org/Doc/tutorial/interpreter.rst 2007-08-17 02:23:34.000000000 +0200
135 +++ Python-3.0a1/Doc/tutorial/interpreter.rst 2007-09-02 19:56:49.932515223 +0200
137 Invoking the Interpreter
138 ========================
140 -The Python interpreter is usually installed as :file:`/usr/local/bin/python` on
141 +The Python interpreter is usually installed as :file:`/usr/bin/python` on
142 those machines where it is available; putting :file:`/usr/local/bin` in your
143 Unix shell's search path makes it possible to start it by typing the command ::
145 diff -urN Python-3.0a1.org/Lib/cgi.py Python-3.0a1/Lib/cgi.py
146 --- Python-3.0a1.org/Lib/cgi.py 2007-08-31 01:06:20.000000000 +0200
147 +++ Python-3.0a1/Lib/cgi.py 2007-09-02 19:56:49.968517266 +0200
149 -#! /usr/local/bin/python
152 -# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
153 +# NOTE: the above "/usr/bin/python" is NOT a mistake. It is
154 # intentionally NOT "/usr/bin/env python". On many systems
155 # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
156 # scripts, and /usr/local/bin is the default directory where Python is
157 diff -urN Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist Python-3.0a1/Mac/PythonLauncher/factorySettings.plist
158 --- Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist 2006-10-25 00:26:37.000000000 +0200
159 +++ Python-3.0a1/Mac/PythonLauncher/factorySettings.plist 2007-09-02 19:56:49.880512272 +0200
162 <key>interpreter_list</key>
164 - <string>/usr/local/bin/pythonw</string>
165 + <string>/usr/bin/pythonw</string>
166 <string>/usr/bin/pythonw</string>
167 <string>/sw/bin/pythonw</string>
171 <key>interpreter_list</key>
173 - <string>/usr/local/bin/pythonw</string>
174 - <string>/usr/local/bin/python</string>
175 + <string>/usr/bin/pythonw</string>
176 + <string>/usr/bin/python</string>
177 <string>/usr/bin/pythonw</string>
178 <string>/usr/bin/python</string>
179 <string>/sw/bin/pythonw</string>
182 <key>interpreter_list</key>
184 - <string>/usr/local/bin/pythonw</string>
185 - <string>/usr/local/bin/python</string>
186 + <string>/usr/bin/pythonw</string>
187 + <string>/usr/bin/python</string>
188 <string>/usr/bin/pythonw</string>
189 <string>/usr/bin/python</string>
190 <string>/sw/bin/pythonw</string>
191 diff -urN Python-3.0a1.org/Mac/README Python-3.0a1/Mac/README
192 --- Python-3.0a1.org/Mac/README 2006-12-13 15:07:43.000000000 +0100
193 +++ Python-3.0a1/Mac/README 2007-09-02 19:56:49.896513180 +0200
195 to be supplied later. Some useful (but outdated) info can be found in
198 -The commandline scripts /usr/local/bin/python and pythonw can be used to run
199 +The commandline scripts /usr/bin/python and pythonw can be used to run
200 non-GUI and GUI python scripts from the command line, respectively.
202 How do I create a binary distribution?
203 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
204 --- Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2006-10-25 00:26:42.000000000 +0200
205 +++ Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2007-09-02 19:56:49.892512953 +0200
209 <p>MacPython 2.3 installs a perfectly normal Unix commandline
210 - python interpreter in <tt>/usr/local/bin/python</tt>. As of Mac OS X 10.2, however,
211 + python interpreter in <tt>/usr/bin/python</tt>. As of Mac OS X 10.2, however,
212 <tt>/usr/local/bin</tt> is not on the search path of your shell. Moreover,
213 Apple's python 2.2, which lives in <tt>/usr/bin</tt> <em>is</em> on your
214 search path, so this can lead to confusion.</p>
215 diff -urN Python-3.0a1.org/Mac/scripts/zappycfiles.py Python-3.0a1/Mac/scripts/zappycfiles.py
216 --- Python-3.0a1.org/Mac/scripts/zappycfiles.py 2007-08-31 01:06:18.000000000 +0200
217 +++ Python-3.0a1/Mac/scripts/zappycfiles.py 2007-09-02 19:56:49.892512953 +0200
219 -#!/usr/local/bin/python
221 """Recursively zap all .pyc and .pyo files"""
224 diff -urN Python-3.0a1.org/Misc/HISTORY Python-3.0a1/Misc/HISTORY
225 --- Python-3.0a1.org/Misc/HISTORY 2007-08-16 18:30:26.000000000 +0200
226 +++ Python-3.0a1/Misc/HISTORY 2007-09-02 19:56:49.872511818 +0200
227 @@ -11092,9 +11092,9 @@
230 - It is now recommended to use ``#!/usr/bin/env python'' instead of
231 -``#!/usr/local/bin/python'' at the start of executable scripts, except
232 +``#!/usr/bin/python'' at the start of executable scripts, except
233 for CGI scripts. It has been determined that the use of /usr/bin/env
234 -is more portable than that of /usr/local/bin/python -- scripts almost
235 +is more portable than that of /usr/bin/python -- scripts almost
236 never have to be edited when the Python interpreter lives in a
237 non-standard place. Note that this doesn't work for CGI scripts since
238 the python executable often doesn't live in the HTTP server's default
239 @@ -14379,7 +14379,7 @@
240 Python exits or receives a SIGTERM or SIGHUP signal.
242 The interpreter is now generally assumed to live in
243 -/usr/local/bin/python (as opposed to /usr/local/python). The script
244 +/usr/bin/python (as opposed to /usr/local/python). The script
245 demo/scripts/fixps.py will update old scripts in place (you can easily
246 modify it to do other similar changes).
248 diff -urN Python-3.0a1.org/Misc/RPM/python-2.6.spec Python-3.0a1/Misc/RPM/python-2.6.spec
249 --- Python-3.0a1.org/Misc/RPM/python-2.6.spec 2006-10-25 00:26:34.000000000 +0200
250 +++ Python-3.0a1/Misc/RPM/python-2.6.spec 2007-09-02 19:56:49.676500697 +0200
251 @@ -150,10 +150,10 @@
253 * Sat Mar 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-3pydotorg]
254 - Being more agressive about finding the paths to fix for
255 - #!/usr/local/bin/python.
258 * Sat Feb 07 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.3-2pydotorg]
259 -- Adding code to remove "#!/usr/local/bin/python" from particular files and
260 +- Adding code to remove "#!/usr/bin/python" from particular files and
261 causing the RPM build to terminate if there are any unexpected files
262 which have that line in them.
266 # fix the #! line in installed files
267 find "$RPM_BUILD_ROOT" -type f -print0 |
268 - xargs -0 grep -l /usr/local/bin/python | while read file
269 + xargs -0 grep -l /usr/bin/python | while read file
272 sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
276 # check to see if there are any straggling #! lines
277 -find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
278 +find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python' \
279 | grep ':1:#!' >/tmp/python-rpm-files.$$ || true
280 if [ -s /tmp/python-rpm-files.$$ ]
283 cat /tmp/python-rpm-files.$$
285 *****************************************************
286 - There are still files referencing /usr/local/bin/python in the
287 + There are still files referencing /usr/bin/python in the
288 install directory. They are listed above. Please fix the .spec
289 file and try again. If you are an end-user, you probably want
290 to report this to jafo-rpms@tummy.com as well.
291 diff -urN Python-3.0a1.org/Tools/faqwiz/faqw.py Python-3.0a1/Tools/faqwiz/faqw.py
292 --- Python-3.0a1.org/Tools/faqwiz/faqw.py 2007-08-03 22:42:22.000000000 +0200
293 +++ Python-3.0a1/Tools/faqwiz/faqw.py 2007-09-02 19:56:49.916514315 +0200
295 -#! /usr/local/bin/python
298 """FAQ wizard bootstrap."""
303 # You need to edit the first line and the lines that define FAQDIR and
304 -# SRCDIR, below: change /usr/local/bin/python to where your Python
305 +# SRCDIR, below: change /usr/bin/python to where your Python
306 # interpreter lives, change the value for FAQDIR to where your FAQ
307 # lives, and change the value for SRCDIR to where your faqwiz.py
308 # module lives. The faqconf.py and faqcust.py files live there, too.
309 diff -urN Python-3.0a1.org/Tools/pybench/pybench.py Python-3.0a1/Tools/pybench/pybench.py
310 --- Python-3.0a1.org/Tools/pybench/pybench.py 2007-08-03 22:42:22.000000000 +0200
311 +++ Python-3.0a1/Tools/pybench/pybench.py 2007-09-02 19:56:49.908513861 +0200
313 -#!/usr/local/bin/python -O
314 +#!/usr/bin/python -O
316 """ A Python Benchmark Suite
318 diff -urN Python-3.0a1.org/Tools/pybench/README Python-3.0a1/Tools/pybench/README
319 --- Python-3.0a1.org/Tools/pybench/README 2006-10-25 00:26:47.000000000 +0200
320 +++ Python-3.0a1/Tools/pybench/README 2007-09-02 19:56:49.912514088 +0200
325 - Executable: /usr/local/bin/python
326 + Executable: /usr/bin/python
328 Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
330 diff -urN Python-3.0a1.org/Tools/scripts/fixps.py Python-3.0a1/Tools/scripts/fixps.py
331 --- Python-3.0a1.org/Tools/scripts/fixps.py 2007-08-03 22:42:22.000000000 +0200
332 +++ Python-3.0a1/Tools/scripts/fixps.py 2007-09-02 19:56:49.900513407 +0200
334 print(filename, ': can\'t open :', msg)
337 - if not re.match('^#! */usr/local/bin/python', line):
338 - print(filename, ': not a /usr/local/bin/python script')
339 + if not re.match('^#! */usr/bin/python', line):
340 + print(filename, ': not a /usr/bin/python script')
345 - line = re.sub('/usr/local/bin/python',
346 + line = re.sub('/usr/bin/python',
347 '/usr/bin/env python', line)
348 print(filename, ':', repr(line))
349 f = open(filename, "w")
350 diff -urN Python-3.0a1.org/Tools/scripts/parseentities.py Python-3.0a1/Tools/scripts/parseentities.py
351 --- Python-3.0a1.org/Tools/scripts/parseentities.py 2006-10-25 00:26:46.000000000 +0200
352 +++ Python-3.0a1/Tools/scripts/parseentities.py 2007-09-02 19:56:49.896513180 +0200
354 -#!/usr/local/bin/python
356 """ Utility for parsing HTML entity definitions available from:
358 http://www.w3.org/ as e.g.
359 diff -urN Python-3.0a1.org/Tools/scripts/README Python-3.0a1/Tools/scripts/README
360 --- Python-3.0a1.org/Tools/scripts/README 2006-10-25 00:26:46.000000000 +0200
361 +++ Python-3.0a1/Tools/scripts/README 2007-09-02 19:56:49.904513634 +0200
363 nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
364 objgraph.py Print object graph from nm output on a library
365 parseentities.py Utility for parsing HTML entity definitions
366 -pathfix.py Change #!/usr/local/bin/python into something else
367 +pathfix.py Change #!/usr/bin/python into something else
368 pdeps.py Print dependencies between Python modules
369 pickle2db.py Load a pickle generated by db2pickle.py to a database
370 pindent.py Indent Python code, giving block-closing comments