Merged revisions 71674 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71674 | tarek.ziade | 2009-04-17 16:29:56 +0200 (Fri, 17 Apr 2009) | 1 line

  DistutilsSetupError was not raised when one single warning occured
........

diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py
index 5dd73b07aff9f975c2cd0e49ebd29fccbffa2683..9a8fca1d5f2d9e2bf17d654c60cc77f568d683db 100644 (file)
--- a/Lib/distutils/command/check.py
+++ b/Lib/distutils/command/check.py
@@ -73,7 +73,7 @@ class check(Command):
 
         # let's raise an error in strict mode, if we have at least
         # one warning
-        if self.strict and self._warnings > 1:
+        if self.strict and self._warnings > 0:
             raise DistutilsSetupError('Please correct your package.')
 
     def check_metadata(self):

diff --git a/Lib/distutils/tests/test_check.py b/Lib/distutils/tests/test_check.py
index 5e0c453140e6b320d5502df6b25bceb73bccdd73..372bae367b1305a679faaa16aaa39fc631e8463e 100644 (file)
--- a/Lib/distutils/tests/test_check.py
+++ b/Lib/distutils/tests/test_check.py
@@ -72,17 +72,16 @@ class CheckTestCase(support.LoggingSilencer,
         self.assertEquals(cmd._warnings, 1)
 
         # let's see if we have an error with strict=1
-        cmd = check(dist)
-        cmd.initialize_options()
-        cmd.strict = 1
-        cmd.ensure_finalized()
-        self.assertRaises(DistutilsSetupError, cmd.run)
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': broken_rest}
+        self.assertRaises(DistutilsSetupError, self._run, metadata,
+                          **{'strict': 1, 'restructuredtext': 1})
 
         # and non-broken rest
-        rest = 'title\n=====\n\ntest'
-        pkg_info, dist = self.create_dist(long_description=rest)
-        cmd = check(dist)
-        cmd.check_restructuredtext()
+        metadata['long_description'] = 'title\n=====\n\ntest'
+        cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEquals(cmd._warnings, 0)
 
     def test_check_all(self):