summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-02 12:54:44 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-02 12:54:44 (GMT)
commit8c86ecdab52528ed7457872c99252d0df94c7157 (patch)
treed740e0102ecaa8eb39270c91ae8f37ab8ebeac12
parent78af7d8392b5671f6877b259df34c36b884dc103 (diff)
downloadcpython-8c86ecdab52528ed7457872c99252d0df94c7157.zip
cpython-8c86ecdab52528ed7457872c99252d0df94c7157.tar.gz
cpython-8c86ecdab52528ed7457872c99252d0df94c7157.tar.bz2
Fix format of warnings from the packaging check command
-rw-r--r--Lib/packaging/command/check.py2
-rw-r--r--Lib/packaging/tests/test_command_check.py11
2 files changed, 12 insertions, 1 deletions
diff --git a/Lib/packaging/command/check.py b/Lib/packaging/command/check.py
index 94c4a97..6715db9 100644
--- a/Lib/packaging/command/check.py
+++ b/Lib/packaging/command/check.py
@@ -32,7 +32,7 @@ class check(Command):
# XXX we could use a special handler for this, but would need to test
# if it works even if the logger has a too high level
self._warnings.append((msg, args))
- return logger.warning(self.get_command_name() + msg, *args)
+ return logger.warning('%s: %s' % (self.get_command_name(), msg), *args)
def run(self):
"""Runs the command."""
diff --git a/Lib/packaging/tests/test_command_check.py b/Lib/packaging/tests/test_command_check.py
index 0bdd616..271e457 100644
--- a/Lib/packaging/tests/test_command_check.py
+++ b/Lib/packaging/tests/test_command_check.py
@@ -124,6 +124,17 @@ class CheckTestCase(support.LoggingCatcher,
cmd.check_hooks_resolvable()
self.assertEqual(len(self.get_logs(logging.WARNING)), 1)
+ def test_warn(self):
+ _, dist = self.create_dist()
+ cmd = check(dist)
+ self.assertEqual([], self.get_logs())
+ cmd.warn('hello')
+ self.assertEqual(['check: hello'], self.get_logs())
+ cmd.warn('hello %s', 'world')
+ self.assertEqual(['check: hello world'], self.get_logs())
+ cmd.warn('hello %s %s', 'beautiful', 'world')
+ self.assertEqual(['check: hello beautiful world'], self.get_logs())
+
def test_suite():
return unittest.makeSuite(CheckTestCase)