[Checkins] SVN: zc.buildout/trunk/ - fixed some issues with Python executable paths containing spaces
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Feb 10 12:01:06 EST 2009
Log message for revision 96392:
- fixed some issues with Python executable paths containing spaces
Changed:
U zc.buildout/trunk/CHANGES.txt
U zc.buildout/trunk/src/zc/buildout/easy_install.py
U zc.buildout/trunk/src/zc/buildout/tests.py
U zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py
-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt 2009-02-10 16:52:20 UTC (rev 96391)
+++ zc.buildout/trunk/CHANGES.txt 2009-02-10 17:01:05 UTC (rev 96392)
@@ -7,6 +7,9 @@
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]
Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py 2009-02-10 16:52:20 UTC (rev 96391)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py 2009-02-10 17:01:05 UTC (rev 96392)
@@ -1158,7 +1158,7 @@
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])
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py 2009-02-10 16:52:20 UTC (rev 96391)
+++ zc.buildout/trunk/src/zc/buildout/tests.py 2009-02-10 17:01:05 UTC (rev 96392)
@@ -2792,7 +2792,7 @@
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 @@
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'),
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py 2009-02-10 16:52:20 UTC (rev 96391)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py 2009-02-10 17:01:05 UTC (rev 96392)
@@ -64,10 +64,8 @@
'zc.buildout-\S+\s*'
),
'__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'),
(re.compile('find-links = http://localhost:\d+/'),
'find-links = http://localhost:8080/'),
(re.compile('index = http://localhost:\d+/index'),
More information about the Checkins
mailing list