Merged revisions 68033 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68033 | tarek.ziade | 2008-12-29 23:23:53 +0100 (Mon, 29 Dec 2008) | 1 line

  fixed #4646 : distutils was choking on empty options arg in the setup function.
........

diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 9ad94fbeb8353321b6c87e115b204bfec10ff4d5..c15ca9770da75f93988601a41066d779e01c5e75 100644 (file)
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -235,7 +235,7 @@ Common commands: (see '--help-commands' for more)
             # 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)

diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
index 6f5fe9c757560cd1c3a2cdbce603770c315095f1..bf59c418442c2193717971dbe1f9128e1fbb8e23 100644 (file)
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -8,6 +8,7 @@ import os
 import StringIO
 import sys
 import unittest
+import warnings
 
 from test.test_support import TESTFN
 
@@ -131,6 +132,29 @@ class DistributionTestCase(unittest.TestCase):
             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):

diff --git a/Misc/NEWS b/Misc/NEWS
index 7067353ac67ea06ea67ff64ece2062f1a745ed49..f1502e6bedc9c4d78ce0b5e001326bfc845fa483 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,9 @@ Core and Builtins
 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.