Commit 483df486 authored by Kirill Smelkov's avatar Kirill Smelkov

golang: tests: Fix $PYTHONPATH handling in _pyrun

We were appending whole $PYTHONPATH to pathv - a vector of path.
But we should instead first split $PYTHONPATH by pathsep and extend pathv.
parent 60e89902
...@@ -1821,7 +1821,7 @@ def _pyrun(argv, stdin=None, stdout=None, stderr=None, **kw): # -> retcode, st ...@@ -1821,7 +1821,7 @@ def _pyrun(argv, stdin=None, stdout=None, stderr=None, **kw): # -> retcode, st
env.update(envadj) env.update(envadj)
envpath = env.get('PYTHONPATH') envpath = env.get('PYTHONPATH')
if envpath is not None: if envpath is not None:
pathv.append(envpath) pathv.extend(envpath.split(os.pathsep))
env['PYTHONPATH'] = os.pathsep.join(pathv) env['PYTHONPATH'] = os.pathsep.join(pathv)
p = Popen(argv, stdin=(PIPE if stdin else None), stdout=stdout, stderr=stderr, env=env, **kw) p = Popen(argv, stdin=(PIPE if stdin else None), stdout=stdout, stderr=stderr, env=env, **kw)
......
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