[Python-checkins] distutils2: Automated merge with ssh://hg at bitbucket.org/mtlpython/distutils2

Sun Jan 23 15:48:23 CET 2011

tarek.ziade pushed cb2aa326f4c3 to distutils2:
http://hg.python.org/distutils2/rev/cb2aa326f4c3
changeset: 887:cb2aa326f4c3
parent: 884:7036f288b82d
parent: 886:465953f9a000
user: Yannick Gingras <ygingras at ygingras.net>
date: Thu Dec 09 12:02:32 2010 -0500
summary:
 Automated merge with ssh://hg@bitbucket.org/mtlpython/distutils2
files:

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -18,15 +18,21 @@
 - Nicolas Cadou
 - Konrad Delong
 - Josip Djolonga
+- Andrew Francis
 - Yannick Gingras
+- Alexandre Hamelin
+- Christian Hudon
 - Jeremy Kloth
 - Amos Latteier
+- Mathieu Leduc-Hamel
 - Martin von LÃ¶wis
+- Simon Mathieu
 - Carl Meyer
 - Alexis MÃ©taireau
 - Zubin Mithra
 - Derek McTavish Mounce
 - Michael Mulich
+- Louis Munro
 - George Peristerakis
 - Mathieu Perreault
 - Sean Reifschneider
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
@@ -49,8 +49,14 @@
 def test_skip_build(self):
 pkg_pth, dist = self.create_dist()
 cmd = bdist(dist)
+ cmd.skip_build = False
+ cmd.formats = ['ztar']
+ cmd.ensure_finalized()
+ self.assertFalse(self._get_platform_called)
+
+ 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)
--
Repository URL: http://hg.python.org/distutils2
