From 7fc784fc55a00230dacef71bf0f6f5ca8e0924be Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Wed, 14 Jan 2009 20:37:51 -0700 Subject: [PATCH] setup: put back configuration of the PYTHONPATH which is necessary to build the Windows packages --- setup.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index cfdd5be0..d78f8fb0 100644 --- a/setup.py +++ b/setup.py @@ -191,7 +191,7 @@ class ShowPythonPath(Command): def run(self): # TODO: --quiet suppresses the 'running show_supportlib' message. # Find a way to do this all the time. - print "PYTHONPATH=%s" % os.environ["PYTHONPATH"] + print "PYTHONPATH=%s" % os.environ.get("PYTHONPATH", '') class RunWithPythonPath(Command): description = "Run a subcommand with PYTHONPATH set appropriately" @@ -210,10 +210,16 @@ class RunWithPythonPath(Command): def finalize_options(self): pass def run(self): - # os.environ['PYTHONPATH'] is already set by add_tahoe_paths, so we - # just need to exec() their command. We must require the command to - # be safe to split on whitespace, and have --python and --directory - # to make it easier to achieve this. + oldpp = os.environ.get("PYTHONPATH", "").split(os.pathsep) + if oldpp == [""]: + # grr silly split() behavior + oldpp = [] + os.environ['PYTHONPATH'] = os.pathsep.join(oldpp + [supportlib,]) + + # We must require the command to be safe to split on + # whitespace, and have --python and --directory to make it + # easier to achieve this. + command = [] if self.python: command.append(sys.executable) -- 2.45.2