1 diff -burN Python-2.3.3.orig/Demo/cgi/cgi1.py Python-2.3.3/Demo/cgi/cgi1.py
2 --- Python-2.3.3.orig/Demo/cgi/cgi1.py 2002-10-17 18:33:40.000000000 +0200
3 +++ Python-2.3.3/Demo/cgi/cgi1.py 2004-03-14 19:18:34.990634848 +0100
5 -#!/usr/local/bin/python
8 """CGI test 1 - check server setup."""
10 diff -burN Python-2.3.3.orig/Demo/cgi/cgi2.py Python-2.3.3/Demo/cgi/cgi2.py
11 --- Python-2.3.3.orig/Demo/cgi/cgi2.py 2002-10-16 23:01:27.000000000 +0200
12 +++ Python-2.3.3/Demo/cgi/cgi2.py 2004-03-14 19:18:41.993570240 +0100
14 -#!/usr/local/bin/python
17 """CGI test 2 - basic use of cgi module."""
19 diff -burN Python-2.3.3.orig/Demo/cgi/cgi3.py Python-2.3.3/Demo/cgi/cgi3.py
20 --- Python-2.3.3.orig/Demo/cgi/cgi3.py 2002-10-17 17:53:02.000000000 +0200
21 +++ Python-2.3.3/Demo/cgi/cgi3.py 2004-03-14 19:18:46.984811456 +0100
23 -#!/usr/local/bin/python
26 """CGI test 3 (persistent data)."""
28 diff -burN Python-2.3.3.orig/Lib/cgi.py Python-2.3.3/Lib/cgi.py
29 --- Python-2.3.3.orig/Lib/cgi.py 2003-02-27 21:14:32.000000000 +0100
30 +++ Python-2.3.3/Lib/cgi.py 2004-03-14 19:18:16.120503544 +0100
32 -#! /usr/local/bin/python
35 # NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
36 # intentionally NOT "/usr/bin/env python". On many systems
37 diff -burN Python-2.3.3.orig/Misc/HISTORY Python-2.3.3/Misc/HISTORY
38 --- Python-2.3.3.orig/Misc/HISTORY 2003-10-20 16:34:46.000000000 +0200
39 +++ Python-2.3.3/Misc/HISTORY 2004-03-14 19:18:16.148499288 +0100
43 - It is now recommended to use ``#!/usr/bin/env python'' instead of
44 -``#!/usr/local/bin/python'' at the start of executable scripts, except
45 +``#!/usr/bin/python'' at the start of executable scripts, except
46 for CGI scripts. It has been determined that the use of /usr/bin/env
47 -is more portable than that of /usr/local/bin/python -- scripts almost
48 +is more portable than that of /usr/bin/python -- scripts almost
49 never have to be edited when the Python interpreter lives in a
50 non-standard place. Note that this doesn't work for CGI scripts since
51 the python executable often doesn't live in the HTTP server's default
52 @@ -10526,7 +10526,7 @@
53 Python exits or receives a SIGTERM or SIGHUP signal.
55 The interpreter is now generally assumed to live in
56 -/usr/local/bin/python (as opposed to /usr/local/python). The script
57 +/usr/bin/python (as opposed to /usr/local/python). The script
58 demo/scripts/fixps.py will update old scripts in place (you can easily
59 modify it to do other similar changes).
61 diff -burN Python-2.3.3.orig/Tools/faqwiz/faqw.py Python-2.3.3/Tools/faqwiz/faqw.py
62 --- Python-2.3.3.orig/Tools/faqwiz/faqw.py 1998-04-04 00:27:04.000000000 +0200
63 +++ Python-2.3.3/Tools/faqwiz/faqw.py 2004-03-14 19:18:16.150498984 +0100
65 -#! /usr/local/bin/python
68 """FAQ wizard bootstrap."""
73 # You need to edit the first line and the lines that define FAQDIR and
74 -# SRCDIR, below: change /usr/local/bin/python to where your Python
75 +# SRCDIR, below: change /usr/bin/python to where your Python
76 # interpreter lives, change the value for FAQDIR to where your FAQ
77 # lives, and change the value for SRCDIR to where your faqwiz.py
78 # module lives. The faqconf.py and faqcust.py files live there, too.
79 diff -burN Python-2.3.3.orig/Tools/scripts/fixps.py Python-2.3.3/Tools/scripts/fixps.py
80 --- Python-2.3.3.orig/Tools/scripts/fixps.py 2003-05-13 20:14:24.000000000 +0200
81 +++ Python-2.3.3/Tools/scripts/fixps.py 2004-03-14 19:18:16.151498832 +0100
83 print filename, ': can\'t open :', msg
86 - if not re.match('^#! */usr/local/bin/python', line):
87 - print filename, ': not a /usr/local/bin/python script'
88 + if not re.match('^#! */usr/bin/python', line):
89 + print filename, ': not a /usr/bin/python script'
94 - line = re.sub('/usr/local/bin/python',
95 + line = re.sub('/usr/bin/python',
96 '/usr/bin/env python', line)
97 print filename, ':', `line`
98 f = open(filename, "w")
99 diff -burN Python-2.3.3.orig/Tools/scripts/parseentities.py Python-2.3.3/Tools/scripts/parseentities.py
100 --- Python-2.3.3.orig/Tools/scripts/parseentities.py 2001-01-17 09:48:39.000000000 +0100
101 +++ Python-2.3.3/Tools/scripts/parseentities.py 2004-03-14 19:19:23.258297048 +0100
103 -#!/usr/local/bin/python
105 """ Utility for parsing HTML entity definitions available from:
107 http://www.w3.org/ as e.g.