[Python-checkins] distutils2: merge

[tarek.ziade]

tarek.ziade pushed 820572a503a8 to distutils2:

http://hg.python.org/distutils2/rev/820572a503a8
changeset:   883:820572a503a8
parent:      882:853e7bc6237c
parent:      872:f52d3aea3fe8
user:        Louis Munro <lm at louismunro.com>
date:        Wed Dec 08 23:05:04 2010 -0500
summary:
  merge

files:
  

diff --git a/distutils2/command/bdist.py b/distutils2/command/bdist.py
--- a/distutils2/command/bdist.py
+++ b/distutils2/command/bdist.py
@@ -4,7 +4,7 @@
 distribution)."""
 import os
 
-from distutils2.util import get_platform
+from distutils2 import util
 from distutils2.command.cmd import Command
 from distutils2.errors import DistutilsPlatformError, DistutilsOptionError
 
@@ -29,7 +29,7 @@
                      "temporary directory for creating built distributions"),
                     ('plat-name=', 'p',
                      "platform name to embed in generated filenames "
-                     "(default: %s)" % get_platform()),
+                     "(default: %s)" % util.get_platform()),
                     ('formats=', None,
                      "formats for distribution (comma-separated list)"),
                     ('dist-dir=', 'd',
@@ -87,7 +87,7 @@
         # have to finalize 'plat_name' before 'bdist_base'
         if self.plat_name is None:
             if self.skip_build:
-                self.plat_name = get_platform()
+                self.plat_name = util.get_platform()
             else:
                 self.plat_name = self.get_finalized_command('build').plat_name
 
diff --git a/distutils2/tests/test_command_bdist.py b/distutils2/tests/test_command_bdist.py
--- a/distutils2/tests/test_command_bdist.py
+++ b/distutils2/tests/test_command_bdist.py
@@ -1,13 +1,31 @@
 """Tests for distutils.command.bdist."""
 
+from distutils2 import util
 from distutils2.tests import run_unittest
 
-from distutils2.command.bdist import bdist
-from distutils2.tests import unittest, support
+from distutils2.command.bdist import bdist, show_formats
+from distutils2.tests import unittest, support, captured_stdout
+
 
 class BuildTestCase(support.TempdirManager,
                     unittest.TestCase):
 
+    def _mock_get_platform(self):
+        self._get_platform_called = True
+        return self._get_platform()
+
+    def setUp(self):
+        super(BuildTestCase, self).setUp()
+
+        # mock util.get_platform
+        self._get_platform_called = False
+        self._get_platform = util.get_platform
+        util.get_platform = self._mock_get_platform
+
+    def tearDown(self):
+        super(BuildTestCase, self).tearDown()
+        util.get_platform = self._get_platform
+
     def test_formats(self):
 
         # let's create a command and make sure
@@ -28,6 +46,25 @@
         found.sort()
         self.assertEqual(found, formats)
 
+    def test_skip_build(self):
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist(dist)
+        cmd.skip_build = True
+        
+        cmd.formats = ['ztar']
+        cmd.ensure_finalized()
+        self.assertTrue(self._get_platform_called)
+
+    def test_show_formats(self):
+        __, stdout = captured_stdout(show_formats)
+
+        # the output should be a header line + one line per format
+        num_formats = len(bdist.format_commands)
+        output = [line for line in stdout.split('\n')
+                  if line.strip().startswith('--formats=')]
+        self.assertEqual(len(output), num_formats)
+
+
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
 

--
Repository URL: http://hg.python.org/distutils2