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