summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-04-11 15:17:04 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-04-11 15:17:04 (GMT)
commitaa4398b6421a2ea26de71d5074b47be26ab439bd (patch)
tree7d46c9d31498541c03806e5323832cedaa0fc190
parentf396ecf3b841fa8b0e66ca13b83c0d23f62c0bcc (diff)
downloadcpython-aa4398b6421a2ea26de71d5074b47be26ab439bd.zip
cpython-aa4398b6421a2ea26de71d5074b47be26ab439bd.tar.gz
cpython-aa4398b6421a2ea26de71d5074b47be26ab439bd.tar.bz2
Merged revisions 71478 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71478 | tarek.ziade | 2009-04-11 17:14:17 +0200 (Sat, 11 Apr 2009) | 1 line testing a full check case ........
-rw-r--r--Lib/distutils/command/check.py2
-rw-r--r--Lib/distutils/tests/test_check.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py
index c729149..d164f3f 100644
--- a/Lib/distutils/command/check.py
+++ b/Lib/distutils/command/check.py
@@ -65,7 +65,7 @@ class check(Command):
if self.metadata:
self.check_metadata()
if self.restructuredtext:
- if docutils:
+ if HAS_DOCUTILS:
self.check_restructuredtext()
elif self.strict:
raise DistutilsSetupError('The docutils package is needed.')
diff --git a/Lib/distutils/tests/test_check.py b/Lib/distutils/tests/test_check.py
index 443fa35..5e0c453 100644
--- a/Lib/distutils/tests/test_check.py
+++ b/Lib/distutils/tests/test_check.py
@@ -85,6 +85,13 @@ class CheckTestCase(support.LoggingSilencer,
cmd.check_restructuredtext()
self.assertEquals(cmd._warnings, 0)
+ def test_check_all(self):
+
+ metadata = {'url': 'xxx', 'author': 'xxx'}
+ self.assertRaises(DistutilsSetupError, self._run,
+ {}, **{'strict': 1,
+ 'restructuredtext': 1})
+
def test_suite():
return unittest.makeSuite(CheckTestCase)