diff options
| -rw-r--r-- | Lib/distutils/dist.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/log.py | 3 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_dist.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index afed545d92..f49afcce13 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -359,7 +359,7 @@ Common commands: (see '--help-commands' for more) parser = ConfigParser() for filename in filenames: if DEBUG: - self.announce(" reading", filename) + self.announce(" reading %s" % filename) parser.read(filename) for section in parser.sections(): options = parser.options(section) diff --git a/Lib/distutils/log.py b/Lib/distutils/log.py index 6f949d5179..758857081c 100644 --- a/Lib/distutils/log.py +++ b/Lib/distutils/log.py @@ -17,6 +17,9 @@ class Log: self.threshold = threshold def _log(self, level, msg, args): + if level not in (DEBUG, INFO, WARN, ERROR, FATAL): + raise ValueError('%s wrong log level' % str(level)) + if level >= self.threshold: if args: msg = msg % args diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py index 553f30c748..3d4b25f0fc 100644 --- a/Lib/distutils/tests/test_dist.py +++ b/Lib/distutils/tests/test_dist.py @@ -200,6 +200,13 @@ class DistributionTestCase(support.TempdirManager, self.assertEquals(cmds, ['distutils.command', 'one', 'two']) + def test_announce(self): + # make sure the level is known + dist = Distribution() + args = ('ok',) + kwargs = {'level': 'ok2'} + self.assertRaises(ValueError, dist.announce, args, kwargs) + class MetadataTestCase(support.TempdirManager, support.EnvironGuard, unittest.TestCase): @@ -379,6 +379,8 @@ Core and Builtins Library ------- +- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. + - Issue #6851: Fix urllib.urlopen crash on secondairy threads on OSX 10.6 - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) |