1 diff -urN Python-2.7.org/Demo/tix/INSTALL.txt Python-2.7/Demo/tix/INSTALL.txt
2 --- Python-2.7.org/Demo/tix/INSTALL.txt 2001-11-11 15:07:37.000000000 +0100
3 +++ Python-2.7/Demo/tix/INSTALL.txt 2010-07-05 20:00:03.472866047 +0200
5 You should now have a working Tix implementation in Python. To see if all
6 is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
8 - /usr/local/bin/python Demo/tix/tixwidgets.py
9 + /usr/bin/python Demo/tix/tixwidgets.py
11 If this does not work, you may need to tell python where to find
12 the Tcl, Tk and Tix library files. This is done by setting the
14 env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
15 TK_LIBRARY=/usr/local/lib/tk8.3 \
16 TIX_LIBRARY=/usr/local/lib/tix8.1 \
17 - /usr/local/bin/python Demo/tix/tixwidgets.py
18 + /usr/bin/python Demo/tix/tixwidgets.py
21 If you find any bugs or have suggestions for improvement, please report them
22 --- p/Doc/c-api/init.rst~ 2012-04-10 01:07:28.000000000 +0200
23 +++ p/Doc/c-api/init.rst 2012-05-10 17:41:58.815998870 +0200
25 Return the *prefix* for installed platform-independent files. This is derived
26 through a number of complicated rules from the program name set with
27 :c:func:`Py_SetProgramName` and some environment variables; for example, if the
28 - program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
29 + program name is ``'/usr/bin/python'``, the prefix is ``'/usr/local'``. The
30 returned string points into static storage; the caller should not modify its
31 value. This corresponds to the :makevar:`prefix` variable in the top-level
32 :file:`Makefile` and the ``--prefix`` argument to the :program:`configure`
34 Return the *exec-prefix* for installed platform-*dependent* files. This is
35 derived through a number of complicated rules from the program name set with
36 :c:func:`Py_SetProgramName` and some environment variables; for example, if the
37 - program name is ``'/usr/local/bin/python'``, the exec-prefix is
38 + program name is ``'/usr/bin/python'``, the exec-prefix is
39 ``'/usr/local'``. The returned string points into static storage; the caller
40 should not modify its value. This corresponds to the :makevar:`exec_prefix`
41 variable in the top-level :file:`Makefile` and the ``--exec-prefix``
42 diff -urN Python-2.7.org/Doc/c-api/intro.rst Python-2.7/Doc/c-api/intro.rst
43 --- Python-2.7.org/Doc/c-api/intro.rst 2010-06-11 02:23:01.000000000 +0200
44 +++ Python-2.7/Doc/c-api/intro.rst 2010-07-05 20:00:03.482863587 +0200
46 path (the environment variable :envvar:`PATH`).
48 For instance, if the Python executable is found in
49 -:file:`/usr/local/bin/python`, it will assume that the libraries are in
50 +:file:`/usr/bin/python`, it will assume that the libraries are in
51 :file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
52 the "fallback" location, used when no executable file named :file:`python` is
53 found along :envvar:`PATH`.) The user can override this behavior by setting the
54 diff -urN Python-2.7.org/Doc/faq/library.rst Python-2.7/Doc/faq/library.rst
55 --- Python-2.7.org/Doc/faq/library.rst 2010-03-12 10:57:43.000000000 +0100
56 +++ Python-2.7/Doc/faq/library.rst 2010-07-05 20:00:03.486197135 +0200
58 The second can be done in a number of ways. The most straightforward way is to
61 - #!/usr/local/bin/python
64 as the very first line of your file, using the pathname for where the Python
65 interpreter is installed on your platform.
68 Yes. Here's a simple example that uses httplib::
70 - #!/usr/local/bin/python
73 import httplib, sys, time
75 diff -urN Python-2.7.org/Doc/install/index.rst Python-2.7/Doc/install/index.rst
76 --- Python-2.7.org/Doc/install/index.rst 2009-10-28 00:06:10.000000000 +0100
77 +++ Python-2.7/Doc/install/index.rst 2010-07-05 20:00:03.506197416 +0200
80 Another possibility is a network filesystem where the name used to write to a
81 remote directory is different from the name used to read it: for example, the
82 -Python interpreter accessed as :file:`/usr/local/bin/python` might search for
83 +Python interpreter accessed as :file:`/usr/bin/python` might search for
84 modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to
85 be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could
88 - /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
89 + /usr/bin/python setup.py install --prefix=/mnt/@server/export
91 In either case, the :option:`--prefix` option defines the installation base, and
92 the :option:`--exec-prefix` option defines the platform-specific installation
93 diff -urN Python-2.7.org/Doc/library/cgi.rst Python-2.7/Doc/library/cgi.rst
94 --- Python-2.7.org/Doc/library/cgi.rst 2009-08-17 21:26:49.000000000 +0200
95 +++ Python-2.7/Doc/library/cgi.rst 2010-07-05 20:00:03.509530626 +0200
97 first line of the script contains ``#!`` starting in column 1 followed by the
98 pathname of the Python interpreter, for instance::
100 - #!/usr/local/bin/python
103 Make sure the Python interpreter exists and is executable by "others".
105 diff -urN Python-2.7.org/Doc/library/pickle.rst Python-2.7/Doc/library/pickle.rst
106 --- Python-2.7.org/Doc/library/pickle.rst 2009-04-27 17:29:09.000000000 +0200
107 +++ Python-2.7/Doc/library/pickle.rst 2010-07-05 20:00:03.512863651 +0200
109 reading resumes from the last location. The :meth:`__setstate__` and
110 :meth:`__getstate__` methods are used to implement this behavior. ::
112 - #!/usr/local/bin/python
116 """Print and number lines in a text file."""
118 >>> import TextReader
119 >>> obj = TextReader.TextReader("TextReader.py")
121 - '1: #!/usr/local/bin/python'
122 + '1: #!/usr/bin/python'
126 diff -urN Python-2.7.org/Doc/tutorial/interpreter.rst Python-2.7/Doc/tutorial/interpreter.rst
127 --- Python-2.7.org/Doc/tutorial/interpreter.rst 2010-04-10 13:16:59.000000000 +0200
128 +++ Python-2.7/Doc/tutorial/interpreter.rst 2010-07-05 20:00:03.516196870 +0200
130 Invoking the Interpreter
131 ========================
133 -The Python interpreter is usually installed as :file:`/usr/local/bin/python` on
134 +The Python interpreter is usually installed as :file:`/usr/bin/python` on
135 those machines where it is available; putting :file:`/usr/local/bin` in your
136 Unix shell's search path makes it possible to start it by typing the command ::
138 diff -urN Python-2.7.org/Lib/cgi.py Python-2.7/Lib/cgi.py
139 --- Python-2.7.org/Lib/cgi.py 2010-03-17 21:05:11.000000000 +0100
140 +++ Python-2.7/Lib/cgi.py 2010-07-05 20:00:03.522865338 +0200
142 -#! /usr/local/bin/python
145 -# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
146 +# NOTE: the above "/usr/bin/python" is NOT a mistake. It is
147 # intentionally NOT "/usr/bin/env python". On many systems
148 # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
149 # scripts, and /usr/local/bin is the default directory where Python is
150 diff -urN Python-2.7.org/Mac/PythonLauncher/factorySettings.plist Python-2.7/Mac/PythonLauncher/factorySettings.plist
151 --- Python-2.7.org/Mac/PythonLauncher/factorySettings.plist 2004-07-16 14:34:23.000000000 +0200
152 +++ Python-2.7/Mac/PythonLauncher/factorySettings.plist 2010-07-05 20:00:03.526197587 +0200
155 <key>interpreter_list</key>
157 - <string>/usr/local/bin/pythonw</string>
158 + <string>/usr/bin/pythonw</string>
159 <string>/usr/bin/pythonw</string>
160 <string>/sw/bin/pythonw</string>
164 <key>interpreter_list</key>
166 - <string>/usr/local/bin/pythonw</string>
167 - <string>/usr/local/bin/python</string>
168 + <string>/usr/bin/pythonw</string>
169 + <string>/usr/bin/python</string>
170 <string>/usr/bin/pythonw</string>
171 <string>/usr/bin/python</string>
172 <string>/sw/bin/pythonw</string>
175 <key>interpreter_list</key>
177 - <string>/usr/local/bin/pythonw</string>
178 - <string>/usr/local/bin/python</string>
179 + <string>/usr/bin/pythonw</string>
180 + <string>/usr/bin/python</string>
181 <string>/usr/bin/pythonw</string>
182 <string>/usr/bin/python</string>
183 <string>/sw/bin/pythonw</string>
184 diff -urN Python-2.7.org/Misc/HISTORY Python-2.7/Misc/HISTORY
185 --- Python-2.7.org/Misc/HISTORY 2010-03-07 16:23:59.000000000 +0100
186 +++ Python-2.7/Misc/HISTORY 2010-07-05 20:00:03.576196805 +0200
187 @@ -13236,9 +13236,9 @@
190 - It is now recommended to use ``#!/usr/bin/env python'' instead of
191 -``#!/usr/local/bin/python'' at the start of executable scripts, except
192 +``#!/usr/bin/python'' at the start of executable scripts, except
193 for CGI scripts. It has been determined that the use of /usr/bin/env
194 -is more portable than that of /usr/local/bin/python -- scripts almost
195 +is more portable than that of /usr/bin/python -- scripts almost
196 never have to be edited when the Python interpreter lives in a
197 non-standard place. Note that this doesn't work for CGI scripts since
198 the python executable often doesn't live in the HTTP server's default
199 @@ -16523,7 +16523,7 @@
200 Python exits or receives a SIGTERM or SIGHUP signal.
202 The interpreter is now generally assumed to live in
203 -/usr/local/bin/python (as opposed to /usr/local/python). The script
204 +/usr/bin/python (as opposed to /usr/local/python). The script
205 demo/scripts/fixps.py will update old scripts in place (you can easily
206 modify it to do other similar changes).
208 diff -urN Python-2.7.org/README Python-2.7/README
209 --- Python-2.7.org/README 2010-07-03 15:56:13.000000000 +0200
210 +++ Python-2.7/README 2010-07-05 20:00:03.586197142 +0200
212 1.5.2 on most older Red Hat installations; several key Red Hat tools
213 require this version. Python 2.1.x may be installed as
214 /usr/bin/python2. The Makefile installs Python as
215 - /usr/local/bin/python, which may or may not take precedence
216 + /usr/bin/python, which may or may not take precedence
217 over /usr/bin/python, depending on how you have set up $PATH.
219 FreeBSD 3.x and probably platforms with NCurses that use libmytinfo or
220 diff -urN Python-2.7.org/Tools/faqwiz/faqw.py Python-2.7/Tools/faqwiz/faqw.py
221 --- Python-2.7.org/Tools/faqwiz/faqw.py 2010-03-11 23:33:25.000000000 +0100
222 +++ Python-2.7/Tools/faqwiz/faqw.py 2010-07-05 20:00:03.589530209 +0200
226 # You need to edit the first line and the lines that define FAQDIR and
227 -# SRCDIR, below: change /usr/local/bin/python to where your Python
228 +# SRCDIR, below: change /usr/bin/python to where your Python
229 # interpreter lives, change the value for FAQDIR to where your FAQ
230 # lives, and change the value for SRCDIR to where your faqwiz.py
231 # module lives. The faqconf.py and faqcust.py files live there, too.
232 diff -urN Python-2.7.org/Tools/pybench/pybench.py Python-2.7/Tools/pybench/pybench.py
233 --- Python-2.7.org/Tools/pybench/pybench.py 2009-10-09 16:32:19.000000000 +0200
234 +++ Python-2.7/Tools/pybench/pybench.py 2010-07-05 20:00:03.592863527 +0200
236 -#!/usr/local/bin/python -O
237 +#!/usr/bin/python -O
239 """ A Python Benchmark Suite
241 diff -urN Python-2.7.org/Tools/pybench/README Python-2.7/Tools/pybench/README
242 --- Python-2.7.org/Tools/pybench/README 2006-06-13 20:56:56.000000000 +0200
243 +++ Python-2.7/Tools/pybench/README 2010-07-05 20:00:03.596196761 +0200
248 - Executable: /usr/local/bin/python
249 + Executable: /usr/bin/python
251 Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
253 diff -urN Python-2.7.org/Tools/scripts/fixps.py Python-2.7/Tools/scripts/fixps.py
254 --- Python-2.7.org/Tools/scripts/fixps.py 2004-08-09 19:27:55.000000000 +0200
255 +++ Python-2.7/Tools/scripts/fixps.py 2010-07-05 20:00:03.599292989 +0200
257 print filename, ': can\'t open :', msg
260 - if not re.match('^#! */usr/local/bin/python', line):
261 - print filename, ': not a /usr/local/bin/python script'
262 + if not re.match('^#! */usr/bin/python', line):
263 + print filename, ': not a /usr/bin/python script'
268 - line = re.sub('/usr/local/bin/python',
269 + line = re.sub('/usr/bin/python',
270 '/usr/bin/env python', line)
271 print filename, ':', repr(line)
272 f = open(filename, "w")
273 diff -urN Python-2.7.org/Tools/scripts/README Python-2.7/Tools/scripts/README
274 --- Python-2.7.org/Tools/scripts/README 2010-02-24 18:06:31.000000000 +0100
275 +++ Python-2.7/Tools/scripts/README 2010-07-05 20:00:03.602863895 +0200
277 nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
278 objgraph.py Print object graph from nm output on a library
279 parseentities.py Utility for parsing HTML entity definitions
280 -pathfix.py Change #!/usr/local/bin/python into something else
281 +pathfix.py Change #!/usr/bin/python into something else
282 pdeps.py Print dependencies between Python modules
283 pickle2db.py Load a pickle generated by db2pickle.py to a database
284 pindent.py Indent Python code, giving block-closing comments