#6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.

This commit is contained in:
Tarek Ziadé 2009-09-21 13:41:08 +00:00
parent ccaf380fab
commit 9977335984
4 changed files with 13 additions and 1 deletions

View File

@ -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)

View File

@ -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

View File

@ -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):

View File

@ -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(...)