- more fixes for Windows

This change reduces test failures on my current platform from 48 to 3.
I hope it doesn't break zc.buildout on any other platform.

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

CHANGES.txt

@@ -7,6 +7,8 @@ Change History
 1.0.2 (unreleased)
 ==================
 
+- More fixes for Windows. A quoted sha-bang is now used on Windows to make the
+  .exe files work with a Python executable in 'program files'.
 
 1.0.1 (2008-04-02)
 ==================

src/zc/buildout/easy_install.py

@@ -897,7 +897,7 @@ def _script(module_name, attrs, path, dest, executable, arguments,
         dest += '-script.py'
 
     contents = script_template % dict(
-        python = executable,
+        python = _safe_arg(executable),
         path = path,
         module_name = module_name,
         attrs = attrs,
@@ -948,7 +948,7 @@ def _pyscript(path, dest, executable):
         dest += '-script.py'
 
     contents = py_script_template % dict(
-        python = executable,
+        python = _safe_arg(executable),
         path = path,
         )
     changed = not (os.path.exists(dest) and open(dest).read() == contents)

src/zc/buildout/tests.py

@@ -589,7 +589,8 @@ if os.path.exists(bootstrap_py):
     ... parts =
     ... ''')
     >>> write('bootstrap.py', open(bootstrap_py).read())
-    >>> print system(sys.executable+' '+'bootstrap.py'), # doctest: +ELLIPSIS
+    >>> print system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+
+    ...              'bootstrap.py'), # doctest: +ELLIPSIS
     Downloading ...
     Generated script '/sample/bin/buildout'.
 
@@ -2587,7 +2588,8 @@ def updateSetup(test):
 
 
 normalize_bang = (
-    re.compile(re.escape('#!'+sys.executable)),
+    re.compile(re.escape('#!'+
+                         zc.buildout.easy_install._safe_arg(sys.executable))),
     '#!/usr/local/bin/python2.4',
     )