Commit 0aefccd0 authored by Jeremy Hylton's avatar Jeremy Hylton

SF patch 773476: NameError when there are no prefixes.

parent 83b13fcb
...@@ -91,11 +91,16 @@ del dir, dircase, L ...@@ -91,11 +91,16 @@ del dir, dircase, L
# using the -S option for Python. See http://www.python.org/sf/586680 # using the -S option for Python. See http://www.python.org/sf/586680
if (os.name == "posix" and sys.path and if (os.name == "posix" and sys.path and
os.path.basename(sys.path[-1]) == "Modules"): os.path.basename(sys.path[-1]) == "Modules"):
from distutils.util import get_platform s = "build/lib.%s-%.3s" % ("linux-i686", sys.version)
s = "build/lib.%s-%.3s" % (get_platform(), sys.version)
s = os.path.join(os.path.dirname(sys.path[-1]), s) s = os.path.join(os.path.dirname(sys.path[-1]), s)
sys.path.append(s) sys.path.append(s)
del get_platform, s ##if (os.name == "posix" and sys.path and
## os.path.basename(sys.path[-1]) == "Modules"):
## from distutils.util import get_platform
## s = "build/lib.%s-%.3s" % (get_platform(), sys.version)
## s = os.path.join(os.path.dirname(sys.path[-1]), s)
## sys.path.append(s)
## del get_platform, s
def _init_pathinfo(): def _init_pathinfo():
global _dirs_in_sys_path global _dirs_in_sys_path
...@@ -158,6 +163,7 @@ def addpackage(sitedir, name): ...@@ -158,6 +163,7 @@ def addpackage(sitedir, name):
_dirs_in_sys_path = None _dirs_in_sys_path = None
prefixes = [sys.prefix] prefixes = [sys.prefix]
sitedir = None # make sure sitedir is initialized because of later 'del'
if sys.exec_prefix != sys.prefix: if sys.exec_prefix != sys.prefix:
prefixes.append(sys.exec_prefix) prefixes.append(sys.exec_prefix)
for prefix in prefixes: for prefix in prefixes:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment