- /usr/local/bin/pythonw
- /usr/local/bin/python
+ /usr/bin/pythonw
+ /usr/bin/python
/usr/bin/pythonw
/usr/bin/python
/sw/bin/pythonw
diff -urN Python-3.0a1.org/Mac/README Python-3.0a1/Mac/README
--- Python-3.0a1.org/Mac/README 2006-12-13 15:07:43.000000000 +0100
+++ Python-3.0a1/Mac/README 2007-09-02 19:56:49.896513180 +0200
@@ -128,7 +128,7 @@
to be supplied later. Some useful (but outdated) info can be found in
Mac/Demo.
-The commandline scripts /usr/local/bin/python and pythonw can be used to run
+The commandline scripts /usr/bin/python and pythonw can be used to run
non-GUI and GUI python scripts from the command line, respectively.
How do I create a binary distribution?
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
--- Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2006-10-25 00:26:42.000000000 +0200
+++ Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2007-09-02 19:56:49.892512953 +0200
@@ -17,7 +17,7 @@
MacPython 2.3 installs a perfectly normal Unix commandline
- python interpreter in /usr/local/bin/python. As of Mac OS X 10.2, however,
+ python interpreter in /usr/bin/python. As of Mac OS X 10.2, however,
/usr/local/bin is not on the search path of your shell. Moreover,
Apple's python 2.2, which lives in /usr/bin is on your
search path, so this can lead to confusion.
diff -urN Python-3.0a1.org/Mac/scripts/zappycfiles.py Python-3.0a1/Mac/scripts/zappycfiles.py
--- Python-3.0a1.org/Mac/scripts/zappycfiles.py 2007-08-31 01:06:18.000000000 +0200
+++ Python-3.0a1/Mac/scripts/zappycfiles.py 2007-09-02 19:56:49.892512953 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
"""Recursively zap all .pyc and .pyo files"""
import os
import sys
diff -urN Python-3.0a1.org/Misc/HISTORY Python-3.0a1/Misc/HISTORY
--- Python-3.0a1.org/Misc/HISTORY 2007-08-16 18:30:26.000000000 +0200
+++ Python-3.0a1/Misc/HISTORY 2007-09-02 19:56:49.872511818 +0200
@@ -11092,9 +11092,9 @@
were invoked.
- It is now recommended to use ``#!/usr/bin/env python'' instead of
-``#!/usr/local/bin/python'' at the start of executable scripts, except
+``#!/usr/bin/python'' at the start of executable scripts, except
for CGI scripts. It has been determined that the use of /usr/bin/env
-is more portable than that of /usr/local/bin/python -- scripts almost
+is more portable than that of /usr/bin/python -- scripts almost
never have to be edited when the Python interpreter lives in a
non-standard place. Note that this doesn't work for CGI scripts since
the python executable often doesn't live in the HTTP server's default
@@ -14379,7 +14379,7 @@
Python exits or receives a SIGTERM or SIGHUP signal.
The interpreter is now generally assumed to live in
-/usr/local/bin/python (as opposed to /usr/local/python). The script
+/usr/bin/python (as opposed to /usr/local/python). The script
demo/scripts/fixps.py will update old scripts in place (you can easily
modify it to do other similar changes).
diff -urN Python-3.0a1.org/Misc/RPM/python-2.6.spec Python-3.0a1/Misc/RPM/python-2.6.spec
--- Python-3.0a1.org/Misc/RPM/python-2.6.spec 2006-10-25 00:26:34.000000000 +0200
+++ Python-3.0a1/Misc/RPM/python-2.6.spec 2007-09-02 19:56:49.676500697 +0200
@@ -150,10 +150,10 @@
* Sat Mar 27 2004 Sean Reifschneider [2.3.2-3pydotorg]
- Being more agressive about finding the paths to fix for
- #!/usr/local/bin/python.
+ #!/usr/bin/python.
* Sat Feb 07 2004 Sean Reifschneider [2.3.3-2pydotorg]
-- Adding code to remove "#!/usr/local/bin/python" from particular files and
+- Adding code to remove "#!/usr/bin/python" from particular files and
causing the RPM build to terminate if there are any unexpected files
which have that line in them.
@@ -296,7 +296,7 @@
# fix the #! line in installed files
find "$RPM_BUILD_ROOT" -type f -print0 |
- xargs -0 grep -l /usr/local/bin/python | while read file
+ xargs -0 grep -l /usr/bin/python | while read file
do
FIXFILE="$file"
sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
@@ -306,7 +306,7 @@
done
# check to see if there are any straggling #! lines
-find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
+find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python' \
| grep ':1:#!' >/tmp/python-rpm-files.$$ || true
if [ -s /tmp/python-rpm-files.$$ ]
then
@@ -314,7 +314,7 @@
cat /tmp/python-rpm-files.$$
cat <<@EOF
*****************************************************
- There are still files referencing /usr/local/bin/python in the
+ There are still files referencing /usr/bin/python in the
install directory. They are listed above. Please fix the .spec
file and try again. If you are an end-user, you probably want
to report this to jafo-rpms@tummy.com as well.
diff -urN Python-3.0a1.org/Tools/faqwiz/faqw.py Python-3.0a1/Tools/faqwiz/faqw.py
--- Python-3.0a1.org/Tools/faqwiz/faqw.py 2007-08-03 22:42:22.000000000 +0200
+++ Python-3.0a1/Tools/faqwiz/faqw.py 2007-09-02 19:56:49.916514315 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
"""FAQ wizard bootstrap."""
@@ -10,7 +10,7 @@
# executable.
# You need to edit the first line and the lines that define FAQDIR and
-# SRCDIR, below: change /usr/local/bin/python to where your Python
+# SRCDIR, below: change /usr/bin/python to where your Python
# interpreter lives, change the value for FAQDIR to where your FAQ
# lives, and change the value for SRCDIR to where your faqwiz.py
# module lives. The faqconf.py and faqcust.py files live there, too.
diff -urN Python-3.0a1.org/Tools/pybench/pybench.py Python-3.0a1/Tools/pybench/pybench.py
--- Python-3.0a1.org/Tools/pybench/pybench.py 2007-08-03 22:42:22.000000000 +0200
+++ Python-3.0a1/Tools/pybench/pybench.py 2007-09-02 19:56:49.908513861 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -O
+#!/usr/bin/python -O
""" A Python Benchmark Suite
diff -urN Python-3.0a1.org/Tools/pybench/README Python-3.0a1/Tools/pybench/README
--- Python-3.0a1.org/Tools/pybench/README 2006-10-25 00:26:47.000000000 +0200
+++ Python-3.0a1/Tools/pybench/README 2007-09-02 19:56:49.912514088 +0200
@@ -141,7 +141,7 @@
Processor: x86_64
Python:
- Executable: /usr/local/bin/python
+ Executable: /usr/bin/python
Version: 2.4.2
Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
Bits: 64bit
diff -urN Python-3.0a1.org/Tools/scripts/fixps.py Python-3.0a1/Tools/scripts/fixps.py
--- Python-3.0a1.org/Tools/scripts/fixps.py 2007-08-03 22:42:22.000000000 +0200
+++ Python-3.0a1/Tools/scripts/fixps.py 2007-09-02 19:56:49.900513407 +0200
@@ -15,13 +15,13 @@
print(filename, ': can\'t open :', msg)
continue
line = f.readline()
- if not re.match('^#! */usr/local/bin/python', line):
- print(filename, ': not a /usr/local/bin/python script')
+ if not re.match('^#! */usr/bin/python', line):
+ print(filename, ': not a /usr/bin/python script')
f.close()
continue
rest = f.read()
f.close()
- line = re.sub('/usr/local/bin/python',
+ line = re.sub('/usr/bin/python',
'/usr/bin/env python', line)
print(filename, ':', repr(line))
f = open(filename, "w")
diff -urN Python-3.0a1.org/Tools/scripts/parseentities.py Python-3.0a1/Tools/scripts/parseentities.py
--- Python-3.0a1.org/Tools/scripts/parseentities.py 2006-10-25 00:26:46.000000000 +0200
+++ Python-3.0a1/Tools/scripts/parseentities.py 2007-09-02 19:56:49.896513180 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
""" Utility for parsing HTML entity definitions available from:
http://www.w3.org/ as e.g.
diff -urN Python-3.0a1.org/Tools/scripts/README Python-3.0a1/Tools/scripts/README
--- Python-3.0a1.org/Tools/scripts/README 2006-10-25 00:26:46.000000000 +0200
+++ Python-3.0a1/Tools/scripts/README 2007-09-02 19:56:49.904513634 +0200
@@ -45,7 +45,7 @@
nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
objgraph.py Print object graph from nm output on a library
parseentities.py Utility for parsing HTML entity definitions
-pathfix.py Change #!/usr/local/bin/python into something else
+pathfix.py Change #!/usr/bin/python into something else
pdeps.py Print dependencies between Python modules
pickle2db.py Load a pickle generated by db2pickle.py to a database
pindent.py Indent Python code, giving block-closing comments
|