Merge changes from distribute 0.6.41

--HG--
rename : distribute_setup.py => ez_setup.py

5 files changed, 96 insertions, 41 deletions

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
new file mode 100644
index 00000000..b1487b78
--- /dev/null
+++ b/setuptools/cli.exe
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 146e1f47..c98be5a2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1832,26 +1832,22 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
             if sys.platform=='win32' or wininst:
                 # On Windows/wininst, add a .py extension and an .exe launcher
                 if group=='gui_scripts':
-                    ext, launcher = '-script.pyw', 'gui.exe'
+                    launcher_type = 'gui'
+                    ext = '-script.pyw'
                     old = ['.pyw']
                     new_header = re.sub('(?i)python.exe','pythonw.exe',header)
                 else:
-                    ext, launcher = '-script.py', 'cli.exe'
+                    launcher_type = 'cli'
+                    ext = '-script.py'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if platform.machine().lower()=='arm':
-                    launcher = launcher.replace(".", "-arm.")
-                if is_64bit():
-                    launcher = launcher.replace(".", "-64.")
-                else:
-                    launcher = launcher.replace(".", "-32.")
                 if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
                     hdr = new_header
                 else:
                     hdr = header
                 yield (name+ext, hdr+script_text, 't', [name+x for x in old])
                 yield (
-                    name+'.exe', resource_string('setuptools', launcher),
+                    name+'.exe', get_win_launcher(launcher_type),
                     'b' # write in binary mode
                 )
                 if not is_64bit():
@@ -1867,6 +1863,23 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                 # just write the stub with no extension.
                 yield (name, header+script_text)
 
+def get_win_launcher(type):
+    """
+    Load the Windows launcher (executable) suitable for launching a script.
+
+    `type` should be either 'cli' or 'gui'
+
+    Returns the executable as a byte string.
+    """
+    launcher_fn = '%s.exe' % type
+    if platform.machine().lower()=='arm':
+        launcher_fn = launcher_fn.replace(".", "-arm.")
+    if is_64bit():
+        launcher_fn = launcher_fn.replace(".", "-64.")
+    else:
+        launcher_fn = launcher_fn.replace(".", "-32.")
+    return resource_string('setuptools', launcher_fn)
+
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
     if sys.version_info[0] < 3:
diff --git a/setuptools/gui.exe b/setuptools/gui.exe
new file mode 100644
index 00000000..f8d35096
--- /dev/null
+++ b/setuptools/gui.exe
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index a9d5d6e5..f51d4567 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -337,10 +337,16 @@ class TestSdistTest(unittest.TestCase):
             filename = decompose(filename)
 
         if sys.version_info >= (3,):
-            if sys.platform == 'win32':
-                # Python 3 mangles the UTF-8 filename
-                filename = filename.decode('cp1252')
-                self.assertTrue(filename in cmd.filelist.files)
+            fs_enc = sys.getfilesystemencoding()
+
+            if sys.platform == 'win32': 
+                if fs_enc == 'cp1252':
+                    # Python 3 mangles the UTF-8 filename
+                    filename = filename.decode('cp1252')
+                    self.assertTrue(filename in cmd.filelist.files)
+                else:
+                    filename = filename.decode('mbcs')
+                    self.assertTrue(filename in cmd.filelist.files)
             else:
                 filename = filename.decode('utf-8')
                 self.assertTrue(filename in cmd.filelist.files)
@@ -357,6 +363,7 @@ class TestSdistTest(unittest.TestCase):
         # Latin-1 filename
         filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
         open(filename, 'w').close()
+        self.assertTrue(os.path.isfile(filename))
 
         quiet()
         try:
@@ -365,12 +372,20 @@ class TestSdistTest(unittest.TestCase):
             unquiet()
 
         if sys.version_info >= (3,):
-            filename = filename.decode('latin-1')
+            #not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
-                # Latin-1 is similar to Windows-1252
+                # Latin-1 is similar to Windows-1252 however 
+                # on mbcs filesys it is not in latin-1 encoding
+                fs_enc = sys.getfilesystemencoding()
+                if fs_enc == 'mbcs':
+                    filename = filename.decode('mbcs')
+                else:
+                    filename = filename.decode('latin-1')
+                    
                 self.assertTrue(filename in cmd.filelist.files)
             else:
                 # The Latin-1 filename should have been skipped
+                filename = filename.decode('latin-1')
                 self.assertFalse(filename in cmd.filelist.files)
         else:
             # No conversion takes place under Python 2 and the file
diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 9ccc96f0..db1daf6b 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -17,15 +17,15 @@ Let's create a simple script, foo-script.py:
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
     >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ... """#!%(python_exe)s
     ... import sys
     ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
+    ... print(sys.argv[0][-14:])
+    ... print(sys.argv[1:])
+    ... print(input)
     ... if __debug__:
-    ...     print 'non-optimized'
+    ...     print('non-optimized')
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
 
@@ -37,7 +37,7 @@ We'll also copy cli.exe to the sample-directory with the name foo.exe:
 
     >>> import pkg_resources
     >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ...     pkg_resources.resource_string('setuptools', 'cli-32.exe')
     ...     )
     >>> f.close()
@@ -49,16 +49,37 @@ GUI programs, the suffix '-script-pyw' is added.)  This is why we
 named out script the way we did.  Now we can run out script by running
 the wrapper:
 
-    >>> import os
-    >>> 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')
+    >>> from subprocess import Popen, PIPE, STDOUT
+    >>> try:
+    ...     unicode=unicode
+    ... except:
+    ...     unicode=str
+    >>> def popen4(cmd, *args):
+    ...     if hasattr(os, 'popen4'):
+    ...         input, output = os.popen4(cmd + " ".join(args))
+    ...         return input, output
+    ...     else:
+    ...         #emulate popen4 in python 3
+    ...         if cmd[0] == '"' and cmd[-1] != '"':
+    ...             cmd = cmd[1:]
+    ...         cmd += " ".join(args)
+    ...         p = Popen(cmd, shell=True, bufsize=0,
+    ...                               stdin=PIPE, stdout=PIPE, stderr=STDOUT)
+    ...         return p.stdin, p.stdout
+    
+    >>> input, output = popen4('"' + nt_quote_arg(os.path.join(sample_directory, 'foo.exe')), 
+    ...                        r' arg1', r'"arg 2"', r'"arg \"2\\\""', r'"arg 4\\"', r'"arg5 a\\b"')
+    >>> bytes_written = input.write('hello\nworld\n'.encode('utf-8'))
     >>> input.close()
-    >>> print output.read(),
+    >>> # This is needed for line ending differences between py2 and py3 on win32
+    >>> msg = unicode(output.read(), encoding='utf-8').split("\n")
+    >>> for line in msg:
+    ...     print(line.strip()) 
     \foo-script.py
     ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
     'hello\nworld\n'
     non-optimized
+    <BLANKLINE>
 
 This example was a little pathological in that it exercised windows
 (MS C runtime) quoting rules:
@@ -82,26 +103,30 @@ options as usual. For example, to run in optimized mode and
 enter the interpreter after running the script, you could use -Oi:
 
     >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ... """#!%(python_exe)s  -Oi
     ... import sys
     ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
+    ... print(sys.argv[0][-14:])
+    ... print(sys.argv[1:])
+    ... print(input)
     ... if __debug__:
-    ...     print 'non-optimized'
+    ...     print('non-optimized')
     ... sys.ps1 = '---'
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
 
-    >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
+    >>> input, output = popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
     >>> input.close()
-    >>> print output.read(),
+    >>> # This is needed for line ending differences between py2 and py3 on win32
+    >>> msg = unicode(output.read(), encoding='utf-8').split("\n")
+    >>> for line in msg:
+    ...     print(line.strip()) 
     \foo-script.py
     []
     ''
     ---
+    <BLANKLINE>
 
 Testing the GUI Version
 -----------------------
@@ -112,11 +137,11 @@ Now let's test the GUI version with the simple scipt, bar-script.py:
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
     >>> f = open(os.path.join(sample_directory, 'bar-script.pyw'), 'w')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ... """#!%(python_exe)s
     ... import sys
     ... f = open(sys.argv[1], 'wb')
-    ... f.write(repr(sys.argv[2]))
+    ... bytes_written = f.write(repr(sys.argv[2]).encode('utf-8'))
     ... f.close()
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
@@ -125,21 +150,23 @@ We'll also copy gui.exe to the sample-directory with the name bar.exe:
 
     >>> import pkg_resources
     >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ...     pkg_resources.resource_string('setuptools', 'gui-32.exe')
     ...     )
     >>> f.close()
 
 Finally, we'll run the script and check the result:
 
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe'))
-    ...               + r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
+    >>> input, output = popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe')),
+    ...               r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
     >>> input.close()
-    >>> print output.read()
+    >>> # This is needed for line ending differences between py2 and py3 on win32
+    >>> msg = unicode(output.read(), encoding='utf-8').split("\n")
+    >>> for line in msg:
+    ...     print(line.strip()) 
     <BLANKLINE>
     >>> f = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
-    >>> print f.read()
+    >>> print(unicode(f.read(), encoding='utf-8'))
     'Test Argument'
     >>> f.close()