Commit d8e5ff45 authored by 's avatar

- fixed some issues with Python executable paths containing spaces

parent 0decc585
...@@ -7,6 +7,9 @@ Change History ...@@ -7,6 +7,9 @@ Change History
1.1.2 (Unreleased) 1.1.2 (Unreleased)
================== ==================
- Made sure the 'redo_pyc' function and the doctest checkers work with Python
executable paths containing spaces.
- Expand shell patterns when processing the list of paths in `develop`, e.g:: - Expand shell patterns when processing the list of paths in `develop`, e.g::
[buildout] [buildout]
......
...@@ -1158,7 +1158,7 @@ def redo_pyc(egg): ...@@ -1158,7 +1158,7 @@ def redo_pyc(egg):
logger.warning("Couldn't compile %s", filepath) logger.warning("Couldn't compile %s", filepath)
else: else:
# Recompile under other optimization. :) # Recompile under other optimization. :)
args = [sys.executable] args = [_safe_arg(sys.executable)]
if __debug__: if __debug__:
args.append('-O') args.append('-O')
args.extend(['-m', 'py_compile', filepath]) args.extend(['-m', 'py_compile', filepath])
......
...@@ -2792,7 +2792,7 @@ def test_suite(): ...@@ -2792,7 +2792,7 @@ def test_suite():
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
(re.compile('__buildout_signature__ = recipes-\S+'), (re.compile('__buildout_signature__ = recipes-\S+'),
'__buildout_signature__ = recipes-SSSSSSSSSSS'), '__buildout_signature__ = recipes-SSSSSSSSSSS'),
(re.compile('executable = \S+python\S*', re.I), (re.compile('executable = [\S ]+python\S*', re.I),
'executable = python'), 'executable = python'),
(re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'), (re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'),
(re.compile('zc.buildout(-\S+)?[.]egg(-link)?'), (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
...@@ -2894,8 +2894,6 @@ def test_suite(): ...@@ -2894,8 +2894,6 @@ def test_suite():
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
(re.compile('__buildout_signature__ = recipes-\S+'), (re.compile('__buildout_signature__ = recipes-\S+'),
'__buildout_signature__ = recipes-SSSSSSSSSSS'), '__buildout_signature__ = recipes-SSSSSSSSSSS'),
(re.compile('executable = \S+python\S*'),
'executable = python'),
(re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'), (re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'),
(re.compile('zc.buildout(-\S+)?[.]egg(-link)?'), (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
'zc.buildout.egg'), 'zc.buildout.egg'),
......
...@@ -64,9 +64,7 @@ def test_suite(): ...@@ -64,9 +64,7 @@ def test_suite():
'zc.buildout-\S+\s*' 'zc.buildout-\S+\s*'
), ),
'__buildout_signature__ = sample- zc.recipe.egg-'), '__buildout_signature__ = sample- zc.recipe.egg-'),
(re.compile('executable = \S+python\S*'), (re.compile('executable = [\S ]+python\S*', re.I),
'executable = python'),
(re.compile('index = \S+python\S+'),
'executable = python'), 'executable = python'),
(re.compile('find-links = http://localhost:\d+/'), (re.compile('find-links = http://localhost:\d+/'),
'find-links = http://localhost:8080/'), 'find-links = http://localhost:8080/'),
......
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