[Python-checkins] r84443 - in python/branches/release27-maint: Lib/ConfigParser.py Lib/test/test_cfgparser.py Misc/NEWS
fred.drake
python-checkins at python.org
Fri Sep 3 05:55:50 CEST 2010
Author: fred.drake
Date: Fri Sep 3 05:55:50 2010
New Revision: 84443
Log:
fix output from RawConfigParser.write and ConfigParser.write for None
values (http://bugs.python.org/issue7005)
Modified:
python/branches/release27-maint/Lib/ConfigParser.py
python/branches/release27-maint/Lib/test/test_cfgparser.py
python/branches/release27-maint/Misc/NEWS
Modified: python/branches/release27-maint/Lib/ConfigParser.py
==============================================================================
--- python/branches/release27-maint/Lib/ConfigParser.py (original)
+++ python/branches/release27-maint/Lib/ConfigParser.py Fri Sep 3 05:55:50 2010
@@ -400,7 +400,7 @@
for (key, value) in self._sections[section].items():
if key == "__name__":
continue
- if value is not None:
+ if (value is not None) or (self._optcre == self.OPTCRE):
key = " = ".join((key, str(value).replace('\n', '\n\t')))
fp.write("%s\n" % (key))
fp.write("\n")
Modified: python/branches/release27-maint/Lib/test/test_cfgparser.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_cfgparser.py (original)
+++ python/branches/release27-maint/Lib/test/test_cfgparser.py Fri Sep 3 05:55:50 2010
@@ -530,6 +530,33 @@
allow_no_value = True
+class Issue7005TestCase(unittest.TestCase):
+ """Test output when None is set() as a value and allow_no_value == False.
+
+ http://bugs.python.org/issue7005
+
+ """
+
+ expected_output = "[section]\noption = None\n\n"
+
+ def prepare(self, config_class):
+ # This is the default, but that's the point.
+ cp = config_class(allow_no_value=False)
+ cp.add_section("section")
+ cp.set("section", "option", None)
+ sio = StringIO.StringIO()
+ cp.write(sio)
+ return sio.getvalue()
+
+ def test_none_as_value_stringified(self):
+ output = self.prepare(ConfigParser.ConfigParser)
+ self.assertEqual(output, self.expected_output)
+
+ def test_none_as_value_stringified_raw(self):
+ output = self.prepare(ConfigParser.RawConfigParser)
+ self.assertEqual(output, self.expected_output)
+
+
class SortedTestCase(RawConfigParserTestCase):
def newconfig(self, defaults=None):
self.cf = self.config_class(defaults=defaults, dict_type=SortedDict)
@@ -563,6 +590,7 @@
SafeConfigParserTestCase,
SafeConfigParserTestCaseNoValue,
SortedTestCase,
+ Issue7005TestCase,
)
Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS (original)
+++ python/branches/release27-maint/Misc/NEWS Fri Sep 3 05:55:50 2010
@@ -36,6 +36,9 @@
Library
-------
+- Issue #7005: Fixed output of None values for RawConfigParser.write and
+ ConfigParser.write.
+
- Issue #808164: Fixed socket.close to avoid references to globals, to
avoid issues when socket.close is called from a __del__ method.
More information about the Python-checkins
mailing list