Commit 9f1eb969 authored by Rafael Monnerat's avatar Rafael Monnerat Committed by Julien Muchembled

Expand the sys.path with entries from PYTHONEXTRAPATH

   This commit is part of fixup the "Add setup-eggs option in zc.recipe.egg:develop."
parent c93f64c5
...@@ -1194,6 +1194,7 @@ class Buildout(DictMixin): ...@@ -1194,6 +1194,7 @@ class Buildout(DictMixin):
setuptools=zc.buildout.easy_install.setuptools_pythonpath, setuptools=zc.buildout.easy_install.setuptools_pythonpath,
setupdir=os.path.dirname(setup), setupdir=os.path.dirname(setup),
setup=setup, setup=setup,
path_list=[],
__file__ = setup, __file__ = setup,
)).encode()) )).encode())
args = [sys.executable, tsetup] + args args = [sys.executable, tsetup] + args
......
...@@ -1182,10 +1182,16 @@ def develop(setup, dest, ...@@ -1182,10 +1182,16 @@ def develop(setup, dest,
undo.append(lambda: os.remove(tsetup)) undo.append(lambda: os.remove(tsetup))
undo.append(lambda: os.close(fd)) undo.append(lambda: os.close(fd))
extra_path = os.environ.get('PYTHONEXTRAPATH')
extra_path_list = []
if extra_path:
extra_path_list = extra_path.split(os.pathsep)
os.write(fd, (runsetup_template % dict( os.write(fd, (runsetup_template % dict(
setuptools=setuptools_pythonpath, setuptools=setuptools_pythonpath,
setupdir=directory, setupdir=directory,
setup=setup, setup=setup,
path_list=extra_path_list,
__file__ = setup, __file__ = setup,
)).encode()) )).encode())
...@@ -1609,6 +1615,10 @@ runsetup_template = """ ...@@ -1609,6 +1615,10 @@ runsetup_template = """
import sys import sys
sys.path[:0] = %(setuptools)r, %(setupdir)r sys.path[:0] = %(setuptools)r, %(setupdir)r
for extra_path in %(path_list)r:
sys.path.insert(0, extra_path)
import os, setuptools import os, setuptools
__file__ = %(__file__)r __file__ = %(__file__)r
......
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