[Python-checkins] cpython (merge 3.3 -> default): Merged `parser['DEFAULT'].__setitem__` fix (issue #16820) from 3.3.
lukasz.langa
python-checkins at python.org
Mon Dec 31 13:57:43 CET 2012
http://hg.python.org/cpython/rev/f6fb5a5748f0
changeset: 81171:f6fb5a5748f0
parent: 81169:66665ef7d9d6
parent: 81170:459a23083b66
user: Łukasz Langa <lukasz at langa.pl>
date: Mon Dec 31 13:57:21 2012 +0100
summary:
Merged `parser['DEFAULT'].__setitem__` fix (issue #16820) from 3.3.
files:
Lib/configparser.py | 5 +++-
Lib/test/test_configparser.py | 28 +++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/Lib/configparser.py b/Lib/configparser.py
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -960,7 +960,10 @@
# XXX this is not atomic if read_dict fails at any point. Then again,
# no update method in configparser is atomic in this implementation.
- self.remove_section(key)
+ if key == self.default_section:
+ self._defaults.clear()
+ else:
+ self.remove_section(key)
self.read_dict({key: value})
def __delitem__(self, key):
diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -797,6 +797,34 @@
self.assertEqual(set(cf.sections()), set())
self.assertEqual(set(cf[self.default_section].keys()), {'foo'})
+ def test_setitem(self):
+ cf = self.fromstring("""
+ [section1]
+ name1 {0[0]} value1
+ [section2]
+ name2 {0[0]} value2
+ [section3]
+ name3 {0[0]} value3
+ """.format(self.delimiters), defaults={"nameD": "valueD"})
+ self.assertEqual(set(cf['section1'].keys()), {'name1', 'named'})
+ self.assertEqual(set(cf['section2'].keys()), {'name2', 'named'})
+ self.assertEqual(set(cf['section3'].keys()), {'name3', 'named'})
+ self.assertEqual(cf['section1']['name1'], 'value1')
+ self.assertEqual(cf['section2']['name2'], 'value2')
+ self.assertEqual(cf['section3']['name3'], 'value3')
+ cf['section2'] = {'name22': 'value22'}
+ self.assertEqual(set(cf['section2'].keys()), {'name22', 'named'})
+ self.assertEqual(cf['section2']['name22'], 'value22')
+ self.assertNotIn('name2', cf['section2'])
+ cf['section3'] = {}
+ self.assertEqual(set(cf['section3'].keys()), {'named'})
+ self.assertNotIn('name3', cf['section3'])
+ cf[self.default_section] = {}
+ self.assertEqual(set(cf[self.default_section].keys()), set())
+ self.assertEqual(set(cf['section1'].keys()), {'name1'})
+ self.assertEqual(set(cf['section2'].keys()), {'name22'})
+ self.assertEqual(set(cf['section3'].keys()), set())
+
class StrictTestCase(BasicTestCase):
config_class = configparser.RawConfigParser
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list