[Python-checkins] r74994 - in python/trunk: Lib/distutils/dist.py Lib/distutils/log.py Lib/distutils/tests/test_dist.py Misc/NEWS

Mon Sep 21 15:41:09 CEST 2009

Author: tarek.ziade
Date: Mon Sep 21 15:41:08 2009
New Revision: 74994
Log:
#6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
Modified:
 python/trunk/Lib/distutils/dist.py
 python/trunk/Lib/distutils/log.py
 python/trunk/Lib/distutils/tests/test_dist.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/distutils/dist.py
==============================================================================

--- python/trunk/Lib/distutils/dist.py	(original)
+++ python/trunk/Lib/distutils/dist.py	Mon Sep 21 15:41:08 2009
@@ -359,7 +359,7 @@
 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)
Modified: python/trunk/Lib/distutils/log.py
==============================================================================
--- python/trunk/Lib/distutils/log.py	(original)
+++ python/trunk/Lib/distutils/log.py	Mon Sep 21 15:41:08 2009
@@ -17,6 +17,9 @@
 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
Modified: python/trunk/Lib/distutils/tests/test_dist.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_dist.py	(original)
+++ python/trunk/Lib/distutils/tests/test_dist.py	Mon Sep 21 15:41:08 2009
@@ -200,6 +200,13 @@
 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):
 
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Sep 21 15:41:08 2009
@@ -379,6 +379,8 @@
 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(...)
