[Python-checkins] r68035 - in python/branches/release26-maint: Lib/distutils/dist.py Lib/distutils/tests/test_dist.py Misc/NEWS

Mon Dec 29 23:36:22 CET 2008

Author: tarek.ziade
Date: Mon Dec 29 23:36:22 2008
New Revision: 68035
Log:
Merged revisions 68033 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r68033 | tarek.ziade | 2008年12月29日 23:23:53 +0100 (2008年12月29日) | 1 line
 
 fixed #4646 : distutils was choking on empty options arg in the setup function.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/distutils/dist.py
 python/branches/release26-maint/Lib/distutils/tests/test_dist.py
 python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/distutils/dist.py
==============================================================================

--- python/branches/release26-maint/Lib/distutils/dist.py	(original)
+++ python/branches/release26-maint/Lib/distutils/dist.py	Mon Dec 29 23:36:22 2008
@@ -235,7 +235,7 @@
 # command options will override any supplied redundantly
 # through the general options dictionary.
 options = attrs.get('options')
- if options:
+ if options is not None:
 del attrs['options']
 for (command, cmd_options) in options.items():
 opt_dict = self.get_option_dict(command)
Modified: python/branches/release26-maint/Lib/distutils/tests/test_dist.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/tests/test_dist.py	(original)
+++ python/branches/release26-maint/Lib/distutils/tests/test_dist.py	Mon Dec 29 23:36:22 2008
@@ -8,6 +8,7 @@
 import StringIO
 import sys
 import unittest
+import warnings
 
 from test.test_support import TESTFN
 
@@ -131,6 +132,29 @@
 if os.path.exists(my_file):
 os.remove(my_file)
 
+ def test_empty_options(self):
+ # an empty options dictionary should not stay in the
+ # list of attributes
+ klass = distutils.dist.Distribution
+
+ # catching warnings
+ warns = []
+ def _warn(msg):
+ warns.append(msg)
+
+ old_warn = warnings.warn
+ warnings.warn = _warn
+ try:
+ dist = klass(attrs={'author': 'xxx',
+ 'name': 'xxx',
+ 'version': 'xxx',
+ 'url': 'xxxx',
+ 'options': {}})
+ finally:
+ warnings.warn = old_warn
+
+ self.assertEquals(len(warns), 0)
+
 class MetadataTestCase(unittest.TestCase):
 
 def test_simple_metadata(self):
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon Dec 29 23:36:22 2008
@@ -132,6 +132,9 @@
 Library
 -------
 
+- Issue #4646: distutils was choking on empty options arg in the setup 
+ function. Original patch by Thomas Heller.
+
 - Issue #4400: .pypirc default generated file was broken in distutils.
 
 - Issue #4736: io.BufferedRWPair's closed property now functions properly.
