Fix ``#!`` parsing problems in Windows ``.exe`` script wrappers, when there

was whitespace inside a quoted argument or at the end of the ``#!`` line
(backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053548

3 files changed, 6 insertions, 5 deletions

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
index 18f23380..3173b2b2 100755
--- a/setuptools/cli.exe
+++ b/setuptools/cli.exe
diff --git a/setuptools/gui.exe b/setuptools/gui.exe
index 2d0b2f26..96521355 100755
--- a/setuptools/gui.exe
+++ b/setuptools/gui.exe
diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index db1a7c3b..9e4dac93 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -15,6 +15,7 @@ will illustrate this.
 Let's create a simple script, foo-script.py:

 

     >>> import os, sys, tempfile

+    >>> from setuptools.command.easy_install import nt_quote_arg

     >>> sample_directory = tempfile.mkdtemp()

     >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(

     ... """#!%(python_exe)s

@@ -25,7 +26,7 @@ Let's create a simple script, foo-script.py:
     ... print input

     ... if __debug__:

     ...     print 'non-optimized'

-    ... """ % dict(python_exe=sys.executable))

+    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))

 

 Note that the script starts with a Unix-style '#!' line saying which

 Python executable to run.  The wrapper will use this to find the

@@ -46,8 +47,8 @@ named out script the way we did.  Now we can run out script by running
 the wrapper:

 

     >>> import os

-    >>> input, output = os.popen4(os.path.join(sample_directory, 'foo.exe')

-    ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b')

+    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))

+    ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')

     >>> input.write('hello\nworld\n')

     >>> input.close()

     >>> print output.read(),

@@ -86,9 +87,9 @@ enter the interpreter after running the script, you could use -Oi:
     ... if __debug__:

     ...     print 'non-optimized'

     ... sys.ps1 = '---'

-    ... """ % dict(python_exe=sys.executable))

+    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))

 

-    >>> input, output = os.popen4(os.path.join(sample_directory, 'foo.exe'))

+    >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))

     >>> input.close()

     >>> print output.read(),

     \foo-script.py