[Python-checkins] r71677 - in python/branches/py3k: Lib/distutils/command/check.py Lib/distutils/tests/test_check.py

Fri Apr 17 16:34:50 CEST 2009

Author: tarek.ziade
Date: Fri Apr 17 16:34:49 2009
New Revision: 71677
Log:
Merged revisions 71674 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r71674 | tarek.ziade | 2009年04月17日 16:29:56 +0200 (2009年4月17日) | 1 line
 
 DistutilsSetupError was not raised when one single warning occured
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/distutils/command/check.py
 python/branches/py3k/Lib/distutils/tests/test_check.py
Modified: python/branches/py3k/Lib/distutils/command/check.py
==============================================================================

--- python/branches/py3k/Lib/distutils/command/check.py	(original)
+++ python/branches/py3k/Lib/distutils/command/check.py	Fri Apr 17 16:34:49 2009
@@ -73,7 +73,7 @@
 
 # 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):
Modified: python/branches/py3k/Lib/distutils/tests/test_check.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_check.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_check.py	Fri Apr 17 16:34:49 2009
@@ -72,17 +72,16 @@
 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):
