diff --git a/Lib/aifc.py b/Lib/aifc.py index 77a9d7d..0f0eff5 100644 --- a/Lib/aifc.py +++ b/Lib/aifc.py @@ -932,7 +932,7 @@ openfp = open # B/W compatibility if __name__ == '__main__': import sys if not sys.argv[1:]: - sys.argv.append('/usr/demos/data/audio/bach.aiff') + sys.argv.append('/demos/data/audio/bach.aiff') fn = sys.argv[1] f = open(fn, 'r') print "Reading", fn diff --git a/Lib/distutils/tests/test_build_scripts.py b/Lib/distutils/tests/test_build_scripts.py index 72e8915..e82f2db 100644 --- a/Lib/distutils/tests/test_build_scripts.py +++ b/Lib/distutils/tests/test_build_scripts.py @@ -54,12 +54,12 @@ class BuildScriptsTestCase(support.TempdirManager, expected = [] expected.append("script1.py") self.write_script(dir, "script1.py", - ("#! /usr/bin/env python2.3\n" + ("#!/bin/env python\n" "# bogus script w/ Python sh-bang\n" "pass\n")) expected.append("script2.py") self.write_script(dir, "script2.py", - ("#!/usr/bin/python\n" + ("#!/bin/python\n" "# bogus script w/ Python sh-bang\n" "pass\n")) expected.append("shell.sh") diff --git a/Lib/distutils/tests/test_install_scripts.py b/Lib/distutils/tests/test_install_scripts.py index b7eb625..ed0ef8f 100644 --- a/Lib/distutils/tests/test_install_scripts.py +++ b/Lib/distutils/tests/test_install_scripts.py @@ -45,10 +45,10 @@ class InstallScriptsTestCase(support.TempdirManager, f.write(text) f.close() - write_script("script1.py", ("#! /usr/bin/env python2.3\n" + write_script("script1.py", ("#!/bin/env python\n" "# bogus script w/ Python sh-bang\n" "pass\n")) - write_script("script2.py", ("#!/usr/bin/python\n" + write_script("script2.py", ("#!/bin/python\n" "# bogus script w/ Python sh-bang\n" "pass\n")) write_script("shell.sh", ("#!/bin/sh\n" diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index bdd230b..6ca376a 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -70,7 +70,7 @@ class EditorWindow(object): if os.path.isdir('/var/www/html/python/'): # "python2" rpm dochome = '/var/www/html/python/index.html' else: - basepath = '/usr/share/doc/' # standard location + basepath = '/lib/doc/' # standard location dochome = os.path.join(basepath, pyver, 'Doc', 'index.html') elif sys.platform[:3] == 'win': diff --git a/Lib/mailcap.py b/Lib/mailcap.py index b2ddacd..4b602ca 100644 --- a/Lib/mailcap.py +++ b/Lib/mailcap.py @@ -43,8 +43,7 @@ def listmailcapfiles(): else: # Don't bother with getpwuid() home = '.' # Last resort - mailcaps = [home + '/.mailcap', '/etc/mailcap', - '/usr/etc/mailcap', '/usr/local/etc/mailcap'] + mailcaps = [home + '/.mailcap', '/etc/mailcap'] return mailcaps diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index e6f72ae..d51b04c 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -39,14 +39,6 @@ __all__ = [ knownfiles = [ "/etc/mime.types", - "/etc/httpd/mime.types", # Mac OS X - "/etc/httpd/conf/mime.types", # Apache - "/etc/apache/mime.types", # Apache 1 - "/etc/apache2/mime.types", # Apache 2 - "/usr/local/etc/httpd/conf/mime.types", - "/usr/local/lib/netscape/mime.types", - "/usr/local/etc/httpd/conf/mime.types", # Apache 1.2 - "/usr/local/etc/mime.types", # Apache 1.3 ] inited = False diff --git a/Lib/plat-linux2/regen b/Lib/plat-linux2/regen index c76950e..341929d 100755 --- a/Lib/plat-linux2/regen +++ b/Lib/plat-linux2/regen @@ -5,4 +5,4 @@ Linux*) ;; exit 1;; esac set -v -h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h +h2py -i '(u_long)' /include/sys/types.h /include/netinet/in.h /include/dlfcn.h diff --git a/Lib/posixpath.py b/Lib/posixpath.py index b6438bd..e1ff394 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -30,7 +30,7 @@ pardir = '..' extsep = '.' sep = '/' pathsep = ':' -defpath = ':/bin:/usr/bin' +defpath = ':/bin' altsep = None devnull = '/dev/null' diff --git a/Lib/uuid.py b/Lib/uuid.py index 259f1bb..d618bc1 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -293,7 +293,7 @@ class UUID(object): def _find_mac(command, args, hw_identifiers, get_index): import os - for dir in ['', '/sbin/', '/usr/sbin']: + for dir in ['', '/bin/']: executable = os.path.join(dir, command) if not os.path.exists(executable): continue diff --git a/Lib/whichdb.py b/Lib/whichdb.py index f077f87..75444f2 100644 --- a/Lib/whichdb.py +++ b/Lib/whichdb.py @@ -1,4 +1,4 @@ -# !/usr/bin/env python +#!/usr/bin/env python """Guess which db package to use to open a db file.""" import os diff --git a/Makefile.pre.in b/Makefile.pre.in index 2d18d62..500505d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -462,7 +462,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ -compatibility_version $(VERSION) \ -current_version $(VERSION); \ else \ - /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ + /bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ @LIBTOOL_CRUFT@ ;\ fi $(INSTALL) -d -m $(DIRMODE) \ @@ -725,7 +725,7 @@ testuniversal: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) - $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS) + $(RUNSHARED) /lib/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS) # Like testall, but with a single pass only