From: Stefan Behnel <scoder@users.berlios.de>
Date: Mon, 4 Oct 2010 09:24:57 +0000 (+0200)
Subject: fix PYTHONPATH setting for end-to-end tests
X-Git-Tag: 0.14.alpha0~303
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33abc02789244ed98fbdabe545c053204dc600eb;p=cython.git

fix PYTHONPATH setting for end-to-end tests
---

diff --git a/runtests.py b/runtests.py
index 89d22793..7ee5650c 100644
--- a/runtests.py
+++ b/runtests.py
@@ -662,11 +662,12 @@ class EndToEndTest(unittest.TestCase):
         commands = (self.commands
             .replace("CYTHON", "PYTHON %s" % os.path.join(self.cython_root, 'cython.py'))
             .replace("PYTHON", sys.executable))
-        commands = """
-        PYTHONPATH="%s%s$PYTHONPATH"
-        %s
-        """ % (self.cython_root, os.pathsep, commands)
-        self.assertEqual(0, os.system(commands))
+        old_path = os.environ.get('PYTHONPATH')
+        try:
+            os.environ['PYTHONPATH'] = self.cython_root + os.pathsep + (old_path or '')
+            self.assertEqual(0, os.system(commands))
+        finally:
+            os.environ['PYTHONPATH'] = old_path
 
 
 # TODO: Support cython_freeze needed here as well.