Commit fa4ab86f authored by Robert Bradshaw's avatar Robert Bradshaw

Python 2.3 fix

parent 112cde8b
...@@ -9,7 +9,6 @@ import shutil ...@@ -9,7 +9,6 @@ import shutil
import unittest import unittest
import doctest import doctest
import operator import operator
import subprocess
import tempfile import tempfile
import traceback import traceback
try: try:
...@@ -731,18 +730,25 @@ class EndToEndTest(unittest.TestCase): ...@@ -731,18 +730,25 @@ class EndToEndTest(unittest.TestCase):
commands = (self.commands commands = (self.commands
.replace("CYTHON", "PYTHON %s" % os.path.join(self.cython_root, 'cython.py')) .replace("CYTHON", "PYTHON %s" % os.path.join(self.cython_root, 'cython.py'))
.replace("PYTHON", sys.executable)) .replace("PYTHON", sys.executable))
old_path = os.environ.get('PYTHONPATH')
try: try:
old_path = os.environ.get('PYTHONPATH')
os.environ['PYTHONPATH'] = os.path.join(self.cython_syspath, (old_path or '')) os.environ['PYTHONPATH'] = os.path.join(self.cython_syspath, (old_path or ''))
for command in commands.split('\n'):
if sys.version_info[:2] >= (2,4):
import subprocess
p = subprocess.Popen(commands, p = subprocess.Popen(commands,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
shell=True) shell=True)
res = p.wait() out, err = p.communicate()
res = p.returncode
if res != 0: if res != 0:
print p.stdout.read() print command
print p.stderr.read() print out
self.assertEqual(0, res) print err
else:
res = os.system(command)
self.assertEqual(0, res, "non-zero exit status")
finally: finally:
if old_path: if old_path:
os.environ['PYTHONPATH'] = old_path os.environ['PYTHONPATH'] = old_path
......
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