summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2012-12-31 02:38:39 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2012-12-31 02:38:39 (GMT)
commit3a8479a5838e0ad4c549d67acfdae2b9e9700e54 (patch)
tree9acf3eb02f12ce39a73539d41b3f3227e1f6f3d7
parent30574695067f948c2ee40d44c06d71e16c6b90f9 (diff)
downloadcpython-3a8479a5838e0ad4c549d67acfdae2b9e9700e54.zip
cpython-3a8479a5838e0ad4c549d67acfdae2b9e9700e54.tar.gz
cpython-3a8479a5838e0ad4c549d67acfdae2b9e9700e54.tar.bz2
Fixes `parser.clean()` reported in issue #16820.
-rw-r--r--Doc/library/configparser.rst8
-rw-r--r--Lib/configparser.py13
-rw-r--r--Lib/test/test_cfgparser.py27
3 files changed, 47 insertions, 1 deletions
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index 958375b..0b8212c 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -389,7 +389,13 @@ However, there are a few differences that should be taken into account:
the default value to be visible again. Trying to delete a default value
causes a ``KeyError``.
-* Trying to delete the ``DEFAULTSECT`` raises ``ValueError``.
+* ``DEFAULTSECT`` cannot be removed from the parser:
+
+ * trying to delete it raises ``ValueError``,
+
+ * ``parser.clear()`` leaves it intact,
+
+ * ``parser.popitem()`` never returns it.
* ``parser.get(section, option, **kwargs)`` - the second argument is **not**
a fallback value. Note however that the section-level ``get()`` methods are
diff --git a/Lib/configparser.py b/Lib/configparser.py
index 06d594a..243efec 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -851,6 +851,19 @@ class RawConfigParser(MutableMapping):
value_getter = lambda option: d[option]
return [(option, value_getter(option)) for option in d.keys()]
+ def popitem(self):
+ """Remove a section from the parser and return it as
+ a (section_name, section_proxy) tuple. If no section is present, raise
+ KeyError.
+
+ The section DEFAULT is never returned because it cannot be removed.
+ """
+ for key in self.sections():
+ value = self[key]
+ del self[key]
+ return key, value
+ raise KeyError
+
def optionxform(self, optionstr):
return optionstr.lower()
diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index a6e9050..7a9e8a8 100644
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -770,6 +770,33 @@ boolean {0[0]} NO
with self.assertRaises(configparser.NoSectionError):
cf.items("no such section")
+ def test_popitem(self):
+ cf = self.fromstring("""
+ [section1]
+ name1 {0[0]} value1
+ [section2]
+ name2 {0[0]} value2
+ [section3]
+ name3 {0[0]} value3
+ """.format(self.delimiters), defaults={"default": "<default>"})
+ self.assertEqual(cf.popitem()[0], 'section1')
+ self.assertEqual(cf.popitem()[0], 'section2')
+ self.assertEqual(cf.popitem()[0], 'section3')
+ with self.assertRaises(KeyError):
+ cf.popitem()
+
+ def test_clear(self):
+ cf = self.newconfig({"foo": "Bar"})
+ self.assertEqual(
+ cf.get(self.default_section, "Foo"), "Bar",
+ "could not locate option, expecting case-insensitive option names")
+ cf['zing'] = {'option1': 'value1', 'option2': 'value2'}
+ self.assertEqual(cf.sections(), ['zing'])
+ self.assertEqual(set(cf['zing'].keys()), {'option1', 'option2', 'foo'})
+ cf.clear()
+ self.assertEqual(set(cf.sections()), set())
+ self.assertEqual(set(cf[self.default_section].keys()), {'foo'})
+
class StrictTestCase(BasicTestCase):
config_class = configparser.RawConfigParser