Merged revisions 74994,74997 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74994 | tarek.ziade | 2009-09-21 15:41:08 +0200 (Mon, 21 Sep 2009) | 1 line
#6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
........
r74997 | tarek.ziade | 2009-09-21 15:49:57 +0200 (Mon, 21 Sep 2009) | 1 line
forgot to commit a file in previous commit (r74994, issue #6954)
........
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index ac5a0ca..1c1ea47 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -354,7 +354,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)
diff --git a/Lib/distutils/log.py b/Lib/distutils/log.py
index 6f949d5..7588570 100644
--- a/Lib/distutils/log.py
+++ b/Lib/distutils/log.py
@@ -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
diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index 1255413..ea12211 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -4,6 +4,7 @@
import tempfile
from distutils import log
+from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
from distutils.core import Distribution
from test.support import EnvironmentVarGuard
@@ -25,6 +26,8 @@
super().tearDown()
def _log(self, level, msg, args):
+ if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+ raise ValueError('%s wrong log level' % str(level))
self.logs.append((level, msg, args))
def get_logs(self, *levels):
diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
index 91297f0..799b0c0 100644
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -171,6 +171,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):
diff --git a/Misc/NEWS b/Misc/NEWS
index 528b3fd..6948fc6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1064,6 +1064,8 @@
Library
-------
+- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
+
- Issue #6163: Fixed HP-UX runtime library dir options in
distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and
Michael Haubenwallner.