]>
Commit | Line | Data |
---|---|---|
e684db95 AM |
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 | |
e3304645 | 3 | +++ Python-3.0a1/Demo/cgi/cgi1.py 2007-09-02 20:58:24.437999826 +0200 |
e684db95 AM |
4 | @@ -1,4 +1,4 @@ |
5 | -#!/usr/local/bin/python | |
e3304645 | 6 | +#!/usr/bin/python3.0 |
e684db95 AM |
7 | |
8 | """CGI test 1 - check server setup.""" | |
9 | ||
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 | |
e3304645 | 12 | +++ Python-3.0a1/Demo/cgi/cgi2.py 2007-09-02 20:58:24.437999826 +0200 |
e684db95 AM |
13 | @@ -1,4 +1,4 @@ |
14 | -#!/usr/local/bin/python | |
e3304645 | 15 | +#!/usr/bin/python3.0 |
e684db95 AM |
16 | |
17 | """CGI test 2 - basic use of cgi module.""" | |
18 | ||
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 | |
e3304645 | 21 | +++ Python-3.0a1/Demo/cgi/cgi3.py 2007-09-02 20:58:24.437999826 +0200 |
e684db95 AM |
22 | @@ -1,4 +1,4 @@ |
23 | -#!/usr/local/bin/python | |
e3304645 | 24 | +#!/usr/bin/python3.0 |
e684db95 AM |
25 | |
26 | """CGI test 3 (persistent data).""" | |
27 | ||
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 | |
e3304645 | 30 | +++ Python-3.0a1/Demo/tix/INSTALL.txt 2007-09-02 20:58:24.442000056 +0200 |
e684db95 AM |
31 | @@ -71,7 +71,7 @@ |
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. | |
34 | Under X windows, do | |
35 | - /usr/local/bin/python Demo/tix/tixwidgets.py | |
e3304645 | 36 | + /usr/bin/python3.0 Demo/tix/tixwidgets.py |
e684db95 AM |
37 | |
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 | |
40 | @@ -80,7 +80,7 @@ | |
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 | |
e3304645 | 45 | + /usr/bin/python3.0 Demo/tix/tixwidgets.py |
e684db95 AM |
46 | |
47 | ||
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 | |
e3304645 | 51 | +++ Python-3.0a1/Doc/c-api/init.rst 2007-09-02 20:58:24.446000286 +0200 |
e684db95 AM |
52 | @@ -195,7 +195,7 @@ |
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 | |
e3304645 | 57 | + program name is ``'/usr/bin/python3.0'``, the prefix is ``'/usr/local'``. The |
e684db95 AM |
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` | |
61 | @@ -208,7 +208,7 @@ | |
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 | |
e3304645 | 66 | + program name is ``'/usr/bin/python3.0'``, the exec-prefix is |
e684db95 AM |
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 | |
e3304645 | 72 | +++ Python-3.0a1/Doc/c-api/intro.rst 2007-09-02 20:58:24.450000516 +0200 |
e684db95 AM |
73 | @@ -536,7 +536,7 @@ |
74 | path (the environment variable :envvar:`PATH`). | |
75 | ||
76 | For instance, if the Python executable is found in | |
77 | -:file:`/usr/local/bin/python`, it will assume that the libraries are in | |
e3304645 | 78 | +:file:`/usr/bin/python3.0`, it will assume that the libraries are in |
e684db95 AM |
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 | |
e3304645 AM |
82 | diff -urN Python-3.0a1.org/Doc/howto/pythonmac.rst Python-3.0a1/Doc/howto/pythonmac.rst |
83 | --- Python-3.0a1.org/Doc/howto/pythonmac.rst 2007-08-17 02:23:33.000000000 +0200 | |
84 | +++ Python-3.0a1/Doc/howto/pythonmac.rst 2007-09-02 20:58:24.478002127 +0200 | |
85 | @@ -44,7 +44,7 @@ | |
86 | symlink to the Python executable is placed in /usr/local/bin/. | |
87 | ||
88 | The Apple-provided build of Python is installed in | |
89 | -:file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python`, | |
90 | +:file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python3.0`, | |
91 | respectively. You should never modify or delete these, as they are | |
92 | Apple-controlled and are used by Apple- or third-party software. | |
93 | ||
e684db95 AM |
94 | diff -urN Python-3.0a1.org/Doc/install/index.rst Python-3.0a1/Doc/install/index.rst |
95 | --- Python-3.0a1.org/Doc/install/index.rst 2007-08-29 00:24:47.000000000 +0200 | |
e3304645 AM |
96 | +++ Python-3.0a1/Doc/install/index.rst 2007-09-02 20:58:24.482002357 +0200 |
97 | @@ -366,16 +366,16 @@ | |
98 | them to go in :file:`/usr/local/lib/python2.{X}` rather than | |
99 | :file:`/usr/lib/python2.{X}`. This can be done with :: | |
100 | ||
101 | - /usr/bin/python setup.py install --prefix=/usr/local | |
102 | + /usr/bin/python3.0 setup.py install --prefix=/usr/local | |
e684db95 AM |
103 | |
104 | Another possibility is a network filesystem where the name used to write to a | |
105 | remote directory is different from the name used to read it: for example, the | |
106 | -Python interpreter accessed as :file:`/usr/local/bin/python` might search for | |
e3304645 | 107 | +Python interpreter accessed as :file:`/usr/bin/python3.0` might search for |
e684db95 AM |
108 | modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to |
109 | be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could | |
110 | be done with :: | |
111 | ||
112 | - /usr/local/bin/python setup.py install --prefix=/mnt/@server/export | |
e3304645 | 113 | + /usr/bin/python3.0 setup.py install --prefix=/mnt/@server/export |
e684db95 AM |
114 | |
115 | In either case, the :option:`--prefix` option defines the installation base, and | |
116 | the :option:`--exec-prefix` option defines the platform-specific installation | |
117 | diff -urN Python-3.0a1.org/Doc/library/cgi.rst Python-3.0a1/Doc/library/cgi.rst | |
118 | --- Python-3.0a1.org/Doc/library/cgi.rst 2007-08-17 02:23:42.000000000 +0200 | |
e3304645 | 119 | +++ Python-3.0a1/Doc/library/cgi.rst 2007-09-02 20:58:24.486002587 +0200 |
e684db95 AM |
120 | @@ -409,7 +409,7 @@ |
121 | first line of the script contains ``#!`` starting in column 1 followed by the | |
122 | pathname of the Python interpreter, for instance:: | |
123 | ||
124 | - #!/usr/local/bin/python | |
e3304645 | 125 | + #!/usr/bin/python3.0 |
e684db95 AM |
126 | |
127 | Make sure the Python interpreter exists and is executable by "others". | |
128 | ||
129 | diff -urN Python-3.0a1.org/Doc/library/pickle.rst Python-3.0a1/Doc/library/pickle.rst | |
130 | --- Python-3.0a1.org/Doc/library/pickle.rst 2007-08-17 02:23:42.000000000 +0200 | |
e3304645 | 131 | +++ Python-3.0a1/Doc/library/pickle.rst 2007-09-02 20:58:24.490002817 +0200 |
e684db95 AM |
132 | @@ -717,7 +717,7 @@ |
133 | reading resumes from the last location. The :meth:`__setstate__` and | |
134 | :meth:`__getstate__` methods are used to implement this behavior. :: | |
135 | ||
136 | - #!/usr/local/bin/python | |
e3304645 | 137 | + #!/usr/bin/python3.0 |
e684db95 AM |
138 | |
139 | class TextReader: | |
140 | """Print and number lines in a text file.""" | |
141 | @@ -754,7 +754,7 @@ | |
142 | >>> import TextReader | |
143 | >>> obj = TextReader.TextReader("TextReader.py") | |
144 | >>> obj.readline() | |
145 | - '1: #!/usr/local/bin/python' | |
e3304645 | 146 | + '1: #!/usr/bin/python3.0' |
e684db95 AM |
147 | >>> obj.readline() |
148 | '2: ' | |
149 | >>> obj.readline() | |
e3304645 AM |
150 | diff -urN Python-3.0a1.org/Doc/README.txt Python-3.0a1/Doc/README.txt |
151 | --- Python-3.0a1.org/Doc/README.txt 2007-08-31 01:06:19.000000000 +0200 | |
152 | +++ Python-3.0a1/Doc/README.txt 2007-09-02 20:58:24.494003047 +0200 | |
153 | @@ -37,7 +37,7 @@ | |
154 | To use a Python interpreter that's not called ``python``, use the standard | |
155 | way to set Makefile variables, using e.g. :: | |
156 | ||
157 | - make html PYTHON=/usr/bin/python2.5 | |
158 | + make html PYTHON=/usr/bin/python3.02.5 | |
159 | ||
160 | Available make targets are: | |
161 | ||
e684db95 AM |
162 | diff -urN Python-3.0a1.org/Doc/tutorial/interpreter.rst Python-3.0a1/Doc/tutorial/interpreter.rst |
163 | --- Python-3.0a1.org/Doc/tutorial/interpreter.rst 2007-08-17 02:23:34.000000000 +0200 | |
e3304645 | 164 | +++ Python-3.0a1/Doc/tutorial/interpreter.rst 2007-09-02 20:58:24.498003277 +0200 |
e684db95 AM |
165 | @@ -10,7 +10,7 @@ |
166 | Invoking the Interpreter | |
167 | ======================== | |
168 | ||
169 | -The Python interpreter is usually installed as :file:`/usr/local/bin/python` on | |
e3304645 | 170 | +The Python interpreter is usually installed as :file:`/usr/bin/python3.0` on |
e684db95 AM |
171 | those machines where it is available; putting :file:`/usr/local/bin` in your |
172 | Unix shell's search path makes it possible to start it by typing the command :: | |
173 | ||
174 | diff -urN Python-3.0a1.org/Lib/cgi.py Python-3.0a1/Lib/cgi.py | |
175 | --- Python-3.0a1.org/Lib/cgi.py 2007-08-31 01:06:20.000000000 +0200 | |
e3304645 | 176 | +++ Python-3.0a1/Lib/cgi.py 2007-09-02 20:58:24.502003507 +0200 |
e684db95 AM |
177 | @@ -1,6 +1,6 @@ |
178 | -#! /usr/local/bin/python | |
e3304645 | 179 | +#! /usr/bin/python3.0 |
e684db95 AM |
180 | |
181 | -# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is | |
e3304645 | 182 | +# NOTE: the above "/usr/bin/python3.0" is NOT a mistake. It is |
e684db95 AM |
183 | # intentionally NOT "/usr/bin/env python". On many systems |
184 | # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI | |
185 | # scripts, and /usr/local/bin is the default directory where Python is | |
e3304645 AM |
186 | diff -urN Python-3.0a1.org/Lib/distutils/tests/test_build_scripts.py Python-3.0a1/Lib/distutils/tests/test_build_scripts.py |
187 | --- Python-3.0a1.org/Lib/distutils/tests/test_build_scripts.py 2006-10-25 00:27:19.000000000 +0200 | |
188 | +++ Python-3.0a1/Lib/distutils/tests/test_build_scripts.py 2007-09-02 20:58:24.502003507 +0200 | |
189 | @@ -58,7 +58,7 @@ | |
190 | "pass\n")) | |
191 | expected.append("script2.py") | |
192 | self.write_script(dir, "script2.py", | |
193 | - ("#!/usr/bin/python\n" | |
194 | + ("#!/usr/bin/python3.0\n" | |
195 | "# bogus script w/ Python sh-bang\n" | |
196 | "pass\n")) | |
197 | expected.append("shell.sh") | |
198 | diff -urN Python-3.0a1.org/Lib/distutils/tests/test_install_scripts.py Python-3.0a1/Lib/distutils/tests/test_install_scripts.py | |
199 | --- Python-3.0a1.org/Lib/distutils/tests/test_install_scripts.py 2006-10-25 00:27:19.000000000 +0200 | |
200 | +++ Python-3.0a1/Lib/distutils/tests/test_install_scripts.py 2007-09-02 20:58:24.506003737 +0200 | |
201 | @@ -48,7 +48,7 @@ | |
202 | write_script("script1.py", ("#! /usr/bin/env python2.3\n" | |
203 | "# bogus script w/ Python sh-bang\n" | |
204 | "pass\n")) | |
205 | - write_script("script2.py", ("#!/usr/bin/python\n" | |
206 | + write_script("script2.py", ("#!/usr/bin/python3.0\n" | |
207 | "# bogus script w/ Python sh-bang\n" | |
208 | "pass\n")) | |
209 | write_script("shell.sh", ("#!/bin/sh\n" | |
210 | diff -urN Python-3.0a1.org/Lib/plat-mac/bundlebuilder.py Python-3.0a1/Lib/plat-mac/bundlebuilder.py | |
211 | --- Python-3.0a1.org/Lib/plat-mac/bundlebuilder.py 2007-08-23 02:07:08.000000000 +0200 | |
212 | +++ Python-3.0a1/Lib/plat-mac/bundlebuilder.py 2007-09-02 20:58:24.510003967 +0200 | |
213 | @@ -500,8 +500,8 @@ | |
214 | makedirs(execdir) | |
215 | if self.standalone or self.semi_standalone: | |
216 | # XXX we're screwed when the end user has deleted | |
217 | - # /usr/bin/python | |
218 | - hashbang = "/usr/bin/python" | |
219 | + # /usr/bin/python3.0 | |
220 | + hashbang = "/usr/bin/python3.0" | |
221 | elif self.python: | |
222 | hashbang = self.python | |
223 | else: | |
224 | diff -urN Python-3.0a1.org/Lib/test/test_bz2.py Python-3.0a1/Lib/test/test_bz2.py | |
225 | --- Python-3.0a1.org/Lib/test/test_bz2.py 2007-08-17 05:42:15.000000000 +0200 | |
226 | +++ Python-3.0a1/Lib/test/test_bz2.py 2007-09-02 20:58:24.514004197 +0200 | |
227 | @@ -1,4 +1,4 @@ | |
228 | -#!/usr/bin/python | |
229 | +#!/usr/bin/python3.0 | |
230 | from test import test_support | |
231 | from test.test_support import TESTFN | |
232 | ||
233 | diff -urN Python-3.0a1.org/Lib/test/test_optparse.py Python-3.0a1/Lib/test/test_optparse.py | |
234 | --- Python-3.0a1.org/Lib/test/test_optparse.py 2007-08-20 20:40:57.000000000 +0200 | |
235 | +++ Python-3.0a1/Lib/test/test_optparse.py 2007-09-02 20:58:24.522004657 +0200 | |
236 | @@ -1,4 +1,4 @@ | |
237 | -#!/usr/bin/python | |
238 | +#!/usr/bin/python3.0 | |
239 | ||
240 | # | |
241 | # Test suite for Optik. Supplied by Johannes Gijsbers | |
242 | diff -urN Python-3.0a1.org/Mac/BuildScript/build-installer.py Python-3.0a1/Mac/BuildScript/build-installer.py | |
243 | --- Python-3.0a1.org/Mac/BuildScript/build-installer.py 2007-08-31 01:14:39.000000000 +0200 | |
244 | +++ Python-3.0a1/Mac/BuildScript/build-installer.py 2007-09-02 20:58:24.526004887 +0200 | |
245 | @@ -1,11 +1,11 @@ | |
246 | -#!/usr/bin/python2.3 | |
247 | +#!/usr/bin/python3.02.3 | |
248 | """ | |
249 | This script is used to build the "official unofficial" universal build on | |
250 | Mac OS X. It requires Mac OS X 10.4, Xcode 2.2 and the 10.4u SDK to do its | |
251 | work. | |
252 | ||
253 | Please ensure that this script keeps working with Python 2.3, to avoid | |
254 | -bootstrap issues (/usr/bin/python is Python 2.3 on OSX 10.4) | |
255 | +bootstrap issues (/usr/bin/python3.0 is Python 2.3 on OSX 10.4) | |
256 | ||
257 | Usage: see USAGE variable in the script. | |
258 | """ | |
e684db95 AM |
259 | diff -urN Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist Python-3.0a1/Mac/PythonLauncher/factorySettings.plist |
260 | --- Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist 2006-10-25 00:26:37.000000000 +0200 | |
e3304645 AM |
261 | +++ Python-3.0a1/Mac/PythonLauncher/factorySettings.plist 2007-09-02 20:58:24.526004887 +0200 |
262 | @@ -10,8 +10,8 @@ | |
e684db95 AM |
263 | <false/> |
264 | <key>interpreter_list</key> | |
265 | <array> | |
266 | - <string>/usr/local/bin/pythonw</string> | |
e3304645 AM |
267 | - <string>/usr/bin/pythonw</string> |
268 | + <string>/usr/bin/python3.0w</string> | |
269 | + <string>/usr/bin/python3.0w</string> | |
e684db95 AM |
270 | <string>/sw/bin/pythonw</string> |
271 | </array> | |
e3304645 AM |
272 | <key>honourhashbang</key> |
273 | @@ -35,10 +35,10 @@ | |
e684db95 AM |
274 | <false/> |
275 | <key>interpreter_list</key> | |
276 | <array> | |
277 | - <string>/usr/local/bin/pythonw</string> | |
278 | - <string>/usr/local/bin/python</string> | |
e3304645 AM |
279 | - <string>/usr/bin/pythonw</string> |
280 | - <string>/usr/bin/python</string> | |
281 | + <string>/usr/bin/python3.0w</string> | |
282 | + <string>/usr/bin/python3.0</string> | |
283 | + <string>/usr/bin/python3.0w</string> | |
284 | + <string>/usr/bin/python3.0</string> | |
e684db95 | 285 | <string>/sw/bin/pythonw</string> |
e3304645 AM |
286 | <string>/sw/bin/python</string> |
287 | </array> | |
288 | @@ -63,10 +63,10 @@ | |
e684db95 AM |
289 | <false/> |
290 | <key>interpreter_list</key> | |
291 | <array> | |
292 | - <string>/usr/local/bin/pythonw</string> | |
293 | - <string>/usr/local/bin/python</string> | |
e3304645 AM |
294 | - <string>/usr/bin/pythonw</string> |
295 | - <string>/usr/bin/python</string> | |
296 | + <string>/usr/bin/python3.0w</string> | |
297 | + <string>/usr/bin/python3.0</string> | |
298 | + <string>/usr/bin/python3.0w</string> | |
299 | + <string>/usr/bin/python3.0</string> | |
e684db95 | 300 | <string>/sw/bin/pythonw</string> |
e3304645 AM |
301 | <string>/sw/bin/python</string> |
302 | </array> | |
e684db95 AM |
303 | diff -urN Python-3.0a1.org/Mac/README Python-3.0a1/Mac/README |
304 | --- Python-3.0a1.org/Mac/README 2006-12-13 15:07:43.000000000 +0100 | |
e3304645 | 305 | +++ Python-3.0a1/Mac/README 2007-09-02 20:58:24.530005117 +0200 |
e684db95 AM |
306 | @@ -128,7 +128,7 @@ |
307 | to be supplied later. Some useful (but outdated) info can be found in | |
308 | Mac/Demo. | |
309 | ||
310 | -The commandline scripts /usr/local/bin/python and pythonw can be used to run | |
e3304645 | 311 | +The commandline scripts /usr/bin/python3.0 and pythonw can be used to run |
e684db95 AM |
312 | non-GUI and GUI python scripts from the command line, respectively. |
313 | ||
314 | How do I create a binary distribution? | |
315 | 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 | |
316 | --- Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2006-10-25 00:26:42.000000000 +0200 | |
e3304645 | 317 | +++ Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2007-09-02 20:58:24.530005117 +0200 |
e684db95 AM |
318 | @@ -17,7 +17,7 @@ |
319 | </td> | |
320 | <td> | |
321 | <p>MacPython 2.3 installs a perfectly normal Unix commandline | |
322 | - python interpreter in <tt>/usr/local/bin/python</tt>. As of Mac OS X 10.2, however, | |
e3304645 | 323 | + python interpreter in <tt>/usr/bin/python3.0</tt>. As of Mac OS X 10.2, however, |
e684db95 AM |
324 | <tt>/usr/local/bin</tt> is not on the search path of your shell. Moreover, |
325 | Apple's python 2.2, which lives in <tt>/usr/bin</tt> <em>is</em> on your | |
326 | search path, so this can lead to confusion.</p> | |
327 | diff -urN Python-3.0a1.org/Mac/scripts/zappycfiles.py Python-3.0a1/Mac/scripts/zappycfiles.py | |
328 | --- Python-3.0a1.org/Mac/scripts/zappycfiles.py 2007-08-31 01:06:18.000000000 +0200 | |
e3304645 | 329 | +++ Python-3.0a1/Mac/scripts/zappycfiles.py 2007-09-02 20:58:24.534005347 +0200 |
e684db95 AM |
330 | @@ -1,4 +1,4 @@ |
331 | -#!/usr/local/bin/python | |
e3304645 | 332 | +#!/usr/bin/python3.0 |
e684db95 AM |
333 | """Recursively zap all .pyc and .pyo files""" |
334 | import os | |
335 | import sys | |
e3304645 AM |
336 | diff -urN Python-3.0a1.org/Mac/Tools/fixapplepython23.py Python-3.0a1/Mac/Tools/fixapplepython23.py |
337 | --- Python-3.0a1.org/Mac/Tools/fixapplepython23.py 2007-08-31 01:06:18.000000000 +0200 | |
338 | +++ Python-3.0a1/Mac/Tools/fixapplepython23.py 2007-09-02 20:58:24.534005347 +0200 | |
339 | @@ -1,4 +1,4 @@ | |
340 | -#!/usr/bin/python | |
341 | +#!/usr/bin/python3.0 | |
342 | """fixapplepython23 - Fix Apple-installed Python 2.3 (on Mac OS X 10.3) | |
343 | ||
344 | Python 2.3 (and 2.3.X for X<5) have the problem that building an extension | |
e684db95 AM |
345 | diff -urN Python-3.0a1.org/Misc/HISTORY Python-3.0a1/Misc/HISTORY |
346 | --- Python-3.0a1.org/Misc/HISTORY 2007-08-16 18:30:26.000000000 +0200 | |
e3304645 | 347 | +++ Python-3.0a1/Misc/HISTORY 2007-09-02 20:58:24.594008798 +0200 |
e684db95 AM |
348 | @@ -11092,9 +11092,9 @@ |
349 | were invoked. | |
350 | ||
351 | - It is now recommended to use ``#!/usr/bin/env python'' instead of | |
352 | -``#!/usr/local/bin/python'' at the start of executable scripts, except | |
e3304645 | 353 | +``#!/usr/bin/python3.0'' at the start of executable scripts, except |
e684db95 AM |
354 | for CGI scripts. It has been determined that the use of /usr/bin/env |
355 | -is more portable than that of /usr/local/bin/python -- scripts almost | |
e3304645 | 356 | +is more portable than that of /usr/bin/python3.0 -- scripts almost |
e684db95 AM |
357 | never have to be edited when the Python interpreter lives in a |
358 | non-standard place. Note that this doesn't work for CGI scripts since | |
359 | the python executable often doesn't live in the HTTP server's default | |
360 | @@ -14379,7 +14379,7 @@ | |
361 | Python exits or receives a SIGTERM or SIGHUP signal. | |
362 | ||
363 | The interpreter is now generally assumed to live in | |
364 | -/usr/local/bin/python (as opposed to /usr/local/python). The script | |
e3304645 | 365 | +/usr/bin/python3.0 (as opposed to /usr/local/python). The script |
e684db95 AM |
366 | demo/scripts/fixps.py will update old scripts in place (you can easily |
367 | modify it to do other similar changes). | |
368 | ||
369 | diff -urN Python-3.0a1.org/Misc/RPM/python-2.6.spec Python-3.0a1/Misc/RPM/python-2.6.spec | |
370 | --- Python-3.0a1.org/Misc/RPM/python-2.6.spec 2006-10-25 00:26:34.000000000 +0200 | |
e3304645 | 371 | +++ Python-3.0a1/Misc/RPM/python-2.6.spec 2007-09-02 20:58:24.598009028 +0200 |
e684db95 AM |
372 | @@ -150,10 +150,10 @@ |
373 | ||
374 | * Sat Mar 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-3pydotorg] | |
375 | - Being more agressive about finding the paths to fix for | |
376 | - #!/usr/local/bin/python. | |
e3304645 | 377 | + #!/usr/bin/python3.0. |
e684db95 AM |
378 | |
379 | * Sat Feb 07 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.3-2pydotorg] | |
380 | -- Adding code to remove "#!/usr/local/bin/python" from particular files and | |
e3304645 | 381 | +- Adding code to remove "#!/usr/bin/python3.0" from particular files and |
e684db95 AM |
382 | causing the RPM build to terminate if there are any unexpected files |
383 | which have that line in them. | |
384 | ||
385 | @@ -296,7 +296,7 @@ | |
386 | ||
387 | # fix the #! line in installed files | |
388 | find "$RPM_BUILD_ROOT" -type f -print0 | | |
389 | - xargs -0 grep -l /usr/local/bin/python | while read file | |
e3304645 | 390 | + xargs -0 grep -l /usr/bin/python3.0 | while read file |
e684db95 AM |
391 | do |
392 | FIXFILE="$file" | |
393 | sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \ | |
394 | @@ -306,7 +306,7 @@ | |
395 | done | |
396 | ||
397 | # check to see if there are any straggling #! lines | |
398 | -find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \ | |
e3304645 | 399 | +find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python3.0' \ |
e684db95 AM |
400 | | grep ':1:#!' >/tmp/python-rpm-files.$$ || true |
401 | if [ -s /tmp/python-rpm-files.$$ ] | |
402 | then | |
403 | @@ -314,7 +314,7 @@ | |
404 | cat /tmp/python-rpm-files.$$ | |
405 | cat <<@EOF | |
406 | ***************************************************** | |
407 | - There are still files referencing /usr/local/bin/python in the | |
e3304645 | 408 | + There are still files referencing /usr/bin/python3.0 in the |
e684db95 AM |
409 | install directory. They are listed above. Please fix the .spec |
410 | file and try again. If you are an end-user, you probably want | |
411 | to report this to jafo-rpms@tummy.com as well. | |
e3304645 AM |
412 | diff -urN Python-3.0a1.org/Modules/getpath.c Python-3.0a1/Modules/getpath.c |
413 | --- Python-3.0a1.org/Modules/getpath.c 2007-05-03 01:01:29.000000000 +0200 | |
414 | +++ Python-3.0a1/Modules/getpath.c 2007-09-02 20:58:24.614009948 +0200 | |
415 | @@ -405,7 +405,7 @@ | |
416 | * "#!/opt/python2.3/bin/python", the kernel only passes "python" | |
417 | * as argv[0], which falls through to the $PATH search below. | |
418 | * If /opt/python2.3/bin isn't in your path, or is near the end, | |
419 | - * this algorithm may incorrectly find /usr/bin/python. To work | |
420 | + * this algorithm may incorrectly find /usr/bin/python3.0. To work | |
421 | * around this, we can use _NSGetExecutablePath to get a better | |
422 | * hint of what the intended interpreter was, although this | |
423 | * will fail if a relative path was used. but in that case, | |
424 | diff -urN Python-3.0a1.org/PC/os2vacpp/readme.txt Python-3.0a1/PC/os2vacpp/readme.txt | |
425 | --- Python-3.0a1.org/PC/os2vacpp/readme.txt 2006-10-25 00:26:50.000000000 +0200 | |
426 | +++ Python-3.0a1/PC/os2vacpp/readme.txt 2007-09-02 20:58:24.618010178 +0200 | |
427 | @@ -78,7 +78,7 @@ | |
428 | -- Using Python as the Default OS/2 Batch Language | |
429 | ||
430 | Note that OS/2 supports the Unix technique of putting the special | |
431 | -comment line at the time of scripts e.g. "#!/usr/bin/python" in | |
432 | +comment line at the time of scripts e.g. "#!/usr/bin/python3.0" in | |
433 | a different syntactic form. To do this, put your script into a file | |
434 | with a .CMD extension and added 'extproc' to the top as follows: | |
435 | ||
e684db95 AM |
436 | diff -urN Python-3.0a1.org/Tools/faqwiz/faqw.py Python-3.0a1/Tools/faqwiz/faqw.py |
437 | --- Python-3.0a1.org/Tools/faqwiz/faqw.py 2007-08-03 22:42:22.000000000 +0200 | |
e3304645 | 438 | +++ Python-3.0a1/Tools/faqwiz/faqw.py 2007-09-02 20:58:24.618010178 +0200 |
e684db95 AM |
439 | @@ -1,4 +1,4 @@ |
440 | -#! /usr/local/bin/python | |
e3304645 | 441 | +#! /usr/bin/python3.0 |
e684db95 AM |
442 | |
443 | """FAQ wizard bootstrap.""" | |
444 | ||
445 | @@ -10,7 +10,7 @@ | |
446 | # executable. | |
447 | ||
448 | # You need to edit the first line and the lines that define FAQDIR and | |
449 | -# SRCDIR, below: change /usr/local/bin/python to where your Python | |
e3304645 | 450 | +# SRCDIR, below: change /usr/bin/python3.0 to where your Python |
e684db95 AM |
451 | # interpreter lives, change the value for FAQDIR to where your FAQ |
452 | # lives, and change the value for SRCDIR to where your faqwiz.py | |
453 | # module lives. The faqconf.py and faqcust.py files live there, too. | |
454 | diff -urN Python-3.0a1.org/Tools/pybench/pybench.py Python-3.0a1/Tools/pybench/pybench.py | |
455 | --- Python-3.0a1.org/Tools/pybench/pybench.py 2007-08-03 22:42:22.000000000 +0200 | |
e3304645 | 456 | +++ Python-3.0a1/Tools/pybench/pybench.py 2007-09-02 20:58:24.622010408 +0200 |
e684db95 AM |
457 | @@ -1,4 +1,4 @@ |
458 | -#!/usr/local/bin/python -O | |
e3304645 | 459 | +#!/usr/bin/python3.0 -O |
e684db95 AM |
460 | |
461 | """ A Python Benchmark Suite | |
462 | ||
463 | diff -urN Python-3.0a1.org/Tools/pybench/README Python-3.0a1/Tools/pybench/README | |
464 | --- Python-3.0a1.org/Tools/pybench/README 2006-10-25 00:26:47.000000000 +0200 | |
e3304645 | 465 | +++ Python-3.0a1/Tools/pybench/README 2007-09-02 20:58:24.626010638 +0200 |
e684db95 AM |
466 | @@ -141,7 +141,7 @@ |
467 | Processor: x86_64 | |
468 | ||
469 | Python: | |
470 | - Executable: /usr/local/bin/python | |
e3304645 | 471 | + Executable: /usr/bin/python3.0 |
e684db95 AM |
472 | Version: 2.4.2 |
473 | Compiler: GCC 3.3.4 (pre 3.3.5 20040809) | |
474 | Bits: 64bit | |
475 | diff -urN Python-3.0a1.org/Tools/scripts/fixps.py Python-3.0a1/Tools/scripts/fixps.py | |
476 | --- Python-3.0a1.org/Tools/scripts/fixps.py 2007-08-03 22:42:22.000000000 +0200 | |
e3304645 | 477 | +++ Python-3.0a1/Tools/scripts/fixps.py 2007-09-02 20:58:24.626010638 +0200 |
e684db95 AM |
478 | @@ -15,13 +15,13 @@ |
479 | print(filename, ': can\'t open :', msg) | |
480 | continue | |
481 | line = f.readline() | |
482 | - if not re.match('^#! */usr/local/bin/python', line): | |
483 | - print(filename, ': not a /usr/local/bin/python script') | |
e3304645 AM |
484 | + if not re.match('^#! */usr/bin/python3.0', line): |
485 | + print(filename, ': not a /usr/bin/python3.0 script') | |
e684db95 AM |
486 | f.close() |
487 | continue | |
488 | rest = f.read() | |
489 | f.close() | |
490 | - line = re.sub('/usr/local/bin/python', | |
e3304645 | 491 | + line = re.sub('/usr/bin/python3.0', |
e684db95 AM |
492 | '/usr/bin/env python', line) |
493 | print(filename, ':', repr(line)) | |
494 | f = open(filename, "w") | |
495 | diff -urN Python-3.0a1.org/Tools/scripts/parseentities.py Python-3.0a1/Tools/scripts/parseentities.py | |
496 | --- Python-3.0a1.org/Tools/scripts/parseentities.py 2006-10-25 00:26:46.000000000 +0200 | |
e3304645 | 497 | +++ Python-3.0a1/Tools/scripts/parseentities.py 2007-09-02 20:58:24.630010868 +0200 |
e684db95 AM |
498 | @@ -1,4 +1,4 @@ |
499 | -#!/usr/local/bin/python | |
e3304645 | 500 | +#!/usr/bin/python3.0 |
e684db95 AM |
501 | """ Utility for parsing HTML entity definitions available from: |
502 | ||
503 | http://www.w3.org/ as e.g. | |
504 | diff -urN Python-3.0a1.org/Tools/scripts/README Python-3.0a1/Tools/scripts/README | |
505 | --- Python-3.0a1.org/Tools/scripts/README 2006-10-25 00:26:46.000000000 +0200 | |
e3304645 | 506 | +++ Python-3.0a1/Tools/scripts/README 2007-09-02 20:58:24.630010868 +0200 |
e684db95 AM |
507 | @@ -45,7 +45,7 @@ |
508 | nm2def.py Create a template for PC/python_nt.def (Marc Lemburg) | |
509 | objgraph.py Print object graph from nm output on a library | |
510 | parseentities.py Utility for parsing HTML entity definitions | |
511 | -pathfix.py Change #!/usr/local/bin/python into something else | |
e3304645 | 512 | +pathfix.py Change #!/usr/bin/python3.0 into something else |
e684db95 AM |
513 | pdeps.py Print dependencies between Python modules |
514 | pickle2db.py Load a pickle generated by db2pickle.py to a database | |
515 | pindent.py Indent Python code, giving block-closing comments |