jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

properly handle non-existent PYTHONPATH

This commit is contained in:
holger krekel 2012-10-20 17:39:15 +02:00
parent 720fe3405b
commit d55fc611c4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
# #
__version__ = '2.3.2.dev2' __version__ = '2.3.2.dev3'

6
setup.py
View File

@ -24,7 +24,7 @@ def main():
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.3.2.dev2', version='2.3.2.dev3',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@ -79,7 +79,9 @@ class PyTest(Command):
pass pass
def run(self): def run(self):
import sys,subprocess import sys,subprocess
os.environ["PYTHONPATH"] = os.environ["PYTHONPATH"] + ":" + os.getcwd() PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
PPATH.insert(0, os.getcwd())
os.environ["PYTHONPATH"] = ":".join(PPATH)
errno = subprocess.call([sys.executable, 'pytest.py']) errno = subprocess.call([sys.executable, 'pytest.py'])
raise SystemExit(errno) raise SystemExit(errno)