Skip to content

Commit

Permalink
Revert "Ugly hack for better zc.buildout support"
Browse files Browse the repository at this point in the history
It introduced bug #56.

This reverts commit 396fda8 (and
90b8961).

This reopens bug #35.
  • Loading branch information
mgedmin committed Nov 26, 2015
1 parent 9be5a51 commit 918507c
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions check_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,9 @@ def run(command, encoding=None, decode=True):
"""
if not encoding:
encoding = locale.getpreferredencoding()
if command and command[0] == sys.executable:
# Workaround for zc.buildout, bootstrapped from a Python that lacks
# setuptools (see https://github.com/mgedmin/check-manifest/issues/35).
# NB: you need to copy the parent os.environ, or at least %SYSTEMROOT%/
# %PATH% (see https://github.com/mgedmin/check-manifest/issues/52).
env = os.environ.copy()
env['PYTHONPATH'] = os.pathsep.join(sys.path)
else:
env = None
try:
pipe = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, env=env)
stderr=subprocess.STDOUT)
except OSError as e:
raise Failure("could not run %s: %s" % (command, e))
output = pipe.communicate()[0]
Expand Down

0 comments on commit 918507c

Please sign in to comment.