- fixed some issues with Python executable paths containing spaces

git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@96392 62d5b8a3-27da-0310-9561-8e5933582275

CHANGES.txt

@@ -7,6 +7,9 @@ Change History
 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::
 
     [buildout]

src/zc/buildout/easy_install.py

@@ -1158,7 +1158,7 @@ def redo_pyc(egg):
                 logger.warning("Couldn't compile %s", filepath)
             else:
                 # Recompile under other optimization. :)
-                args = [sys.executable]
+                args = [_safe_arg(sys.executable)]
                 if __debug__:
                     args.append('-O')
                 args.extend(['-m', 'py_compile', filepath])

src/zc/buildout/tests.py

@@ -2792,7 +2792,7 @@ def test_suite():
                zc.buildout.testing.normalize_egg_py,
                (re.compile('__buildout_signature__ = recipes-\S+'),
                 '__buildout_signature__ = recipes-SSSSSSSSSSS'),
-               (re.compile('executable = \S+python\S*', re.I),
+               (re.compile('executable = [\S ]+python\S*', re.I),
                 'executable = python'),
                (re.compile('[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
                (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
@@ -2894,8 +2894,6 @@ def test_suite():
                zc.buildout.testing.normalize_egg_py,
                (re.compile('__buildout_signature__ = recipes-\S+'),
                 '__buildout_signature__ = recipes-SSSSSSSSSSS'),
-               (re.compile('executable = \S+python\S*'),
-                'executable = python'),
                (re.compile('[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
                (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
                 'zc.buildout.egg'),

zc.recipe.egg_/src/zc/recipe/egg/tests.py

@@ -64,9 +64,7 @@ def test_suite():
                            'zc.buildout-\S+\s*'
                            ),
                 '__buildout_signature__ = sample- zc.recipe.egg-'),
-               (re.compile('executable = \S+python\S*'),
-                'executable = python'),
-               (re.compile('index = \S+python\S+'),
+               (re.compile('executable = [\S ]+python\S*', re.I),
                 'executable = python'),
                (re.compile('find-links = http://localhost:\d+/'),
                 'find-links = http://localhost:8080/'),