diff options
author | Guido van Rossum <guido@python.org> | 1998-03-26 21:13:24 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1998-03-26 21:13:24 (GMT) |
commit | 45e2fbc2e70ef28b1f0327207f33dab3a4e825c5 (patch) | |
tree | 24cafdb6ffb07170188292a02440935291327cde /Lib/site.py | |
parent | 9ea7024754f0e42d7fc70fd1c8f6f6cfbf7e1cf0 (diff) | |
download | cpython-45e2fbc2e70ef28b1f0327207f33dab3a4e825c5.zip cpython-45e2fbc2e70ef28b1f0327207f33dab3a4e825c5.tar.gz cpython-45e2fbc2e70ef28b1f0327207f33dab3a4e825c5.tar.bz2 |
Mass check-in after untabifying all files that need it.
Diffstat (limited to 'Lib/site.py')
-rw-r--r-- | Lib/site.py | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/Lib/site.py b/Lib/site.py index 876c0d1..4ef8cb8 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -61,61 +61,61 @@ import sys, os def addsitedir(sitedir): if sitedir not in sys.path: - sys.path.append(sitedir) # Add path component + sys.path.append(sitedir) # Add path component try: - names = os.listdir(sitedir) + names = os.listdir(sitedir) except os.error: - return + return names = map(os.path.normcase, names) names.sort() for name in names: - if name[-4:] == ".pth": - addpackage(sitedir, name) + if name[-4:] == ".pth": + addpackage(sitedir, name) def addpackage(sitedir, name): fullname = os.path.join(sitedir, name) try: - f = open(fullname) + f = open(fullname) except IOError: - return + return while 1: - dir = f.readline() - if not dir: - break - if dir[0] == '#': - continue - if dir[-1] == '\n': - dir = dir[:-1] - dir = os.path.join(sitedir, dir) - if dir not in sys.path and os.path.exists(dir): - sys.path.append(dir) + dir = f.readline() + if not dir: + break + if dir[0] == '#': + continue + if dir[-1] == '\n': + dir = dir[:-1] + dir = os.path.join(sitedir, dir) + if dir not in sys.path and os.path.exists(dir): + sys.path.append(dir) prefixes = [sys.prefix] if sys.exec_prefix != sys.prefix: prefixes.append(sys.exec_prefix) for prefix in prefixes: if prefix: - if os.sep == '/': - sitedirs = [os.path.join(prefix, - "lib", - "python" + sys.version[:3], - "site-packages"), - os.path.join(prefix, "lib", "site-python")] - else: - sitedirs = [prefix] - for sitedir in sitedirs: - if os.path.isdir(sitedir): - addsitedir(sitedir) + if os.sep == '/': + sitedirs = [os.path.join(prefix, + "lib", + "python" + sys.version[:3], + "site-packages"), + os.path.join(prefix, "lib", "site-python")] + else: + sitedirs = [prefix] + for sitedir in sitedirs: + if os.path.isdir(sitedir): + addsitedir(sitedir) try: - import sitecustomize # Run arbitrary site specific code + import sitecustomize # Run arbitrary site specific code except ImportError: - pass # No site customization module + pass # No site customization module def _test(): print "sys.path = [" for dir in sys.path: - print " %s," % `dir` + print " %s," % `dir` print "]" if __name__ == '__main__': |