Mailman 3 December 2012 - Python-checkins

cpython (merge 3.3 -> default): Merged `parser['DEFAULT'].__setitem__` fix (issue #16820) from 3.3.
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/f6fb5a5748f0 changeset: 81171:f6fb5a5748f0 parent: 81169:66665ef7d9d6 parent: 81170:459a23083b66 user: Łukasz Langa <lukasz(a)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

1 0

cpython (3.3): Fixes `__setitem__` on parser['DEFAULT'] reported in issue #16820.
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/459a23083b66 changeset: 81170:459a23083b66 branch: 3.3 parent: 81168:9472928af085 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 13:55:11 2012 +0100 summary: Fixes `__setitem__` on parser['DEFAULT'] reported in issue #16820. 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

1 0

cpython (merge 3.3 -> default): Issue #16824: Fix a failure guard in the never reached in the normal test
by serhiy.storchaka Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/66665ef7d9d6 changeset: 81169:66665ef7d9d6 parent: 81167:c6f9bc5a0cf1 parent: 81168:9472928af085 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Dec 31 11:37:34 2012 +0200 summary: Issue #16824: Fix a failure guard in the never reached in the normal test execution code in test_pep380. Original patch by Stefan Behnel. files: Lib/test/test_pep380.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_pep380.py b/Lib/test/test_pep380.py --- a/Lib/test/test_pep380.py +++ b/Lib/test/test_pep380.py @@ -519,7 +519,7 @@ next(gi) for x in range(3): y = gi.send(42) - trace.append("Should not have yielded:", y) + trace.append("Should not have yielded: %s" % (y,)) except AttributeError as e: self.assertIn("send", e.args[0]) else: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #16824: Fix a failure guard in the never reached in the normal test
by serhiy.storchaka Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/9472928af085 changeset: 81168:9472928af085 branch: 3.3 parent: 81166:4fc2fea807e6 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Dec 31 11:31:41 2012 +0200 summary: Issue #16824: Fix a failure guard in the never reached in the normal test execution code in test_pep380. files: Lib/test/test_pep380.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_pep380.py b/Lib/test/test_pep380.py --- a/Lib/test/test_pep380.py +++ b/Lib/test/test_pep380.py @@ -519,7 +519,7 @@ next(gi) for x in range(3): y = gi.send(42) - trace.append("Should not have yielded:", y) + trace.append("Should not have yielded: %s" % (y,)) except AttributeError as e: self.assertIn("send", e.args[0]) else: -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (b4975cb4be95): sum=0
by solipsis＠pitrou.net Dec. 31, 2012

Dec. 31, 2012

results for b4975cb4be95 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/refloggE7iL3', '-x']

1 0

cpython (merge 3.3 -> default): Merged `parser.clean()` fix (issue #16820) from 3.2 through 3.3.
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/c6f9bc5a0cf1 changeset: 81167:c6f9bc5a0cf1 parent: 81163:b4975cb4be95 parent: 81166:4fc2fea807e6 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 03:43:37 2012 +0100 summary: Merged `parser.clean()` fix (issue #16820) from 3.2 through 3.3. files: Doc/library/configparser.rst | 8 +++++- Lib/configparser.py | 13 +++++++++++ Lib/test/test_configparser.py | 27 +++++++++++++++++++++++ Misc/ACKS | 1 + 4 files changed, 48 insertions(+), 1 deletions(-) diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -389,7 +389,13 @@ 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 --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -852,6 +852,19 @@ 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_configparser.py b/Lib/test/test_configparser.py --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -770,6 +770,33 @@ 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 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1057,6 +1057,7 @@ Andreas Schawo Neil Schemenauer David Scherer +Wolfgang Scherer Hynek Schlawack Bob Schmertz Gregor Schmid -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.3): Merged `parser.clean()` fix (issue #16820) from 3.2.
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/4fc2fea807e6 changeset: 81166:4fc2fea807e6 branch: 3.3 parent: 81162:cc277b25eae7 parent: 81165:0786dfc3b2b4 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 03:41:54 2012 +0100 summary: Merged `parser.clean()` fix (issue #16820) from 3.2. files: Doc/library/configparser.rst | 8 +++++- Lib/configparser.py | 13 +++++++++++ Lib/test/test_configparser.py | 27 +++++++++++++++++++++++ Misc/ACKS | 1 + 4 files changed, 48 insertions(+), 1 deletions(-) diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -389,7 +389,13 @@ 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 --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -852,6 +852,19 @@ 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_configparser.py b/Lib/test/test_configparser.py --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -770,6 +770,33 @@ 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 diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1049,6 +1049,7 @@ Andreas Schawo Neil Schemenauer David Scherer +Wolfgang Scherer Hynek Schlawack Bob Schmertz Gregor Schmid -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): added Wolfgang Scherer to acknowledgements
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/0786dfc3b2b4 changeset: 81165:0786dfc3b2b4 branch: 3.2 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 03:40:36 2012 +0100 summary: added Wolfgang Scherer to acknowledgements files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -947,6 +947,7 @@ Andreas Schawo Neil Schemenauer David Scherer +Wolfgang Scherer Hynek Schlawack Bob Schmertz Gregor Schmid -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fixes `parser.clean()` reported in issue #16820.
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/dc5adc08f1a8 changeset: 81164:dc5adc08f1a8 branch: 3.2 parent: 81161:850503a117a9 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 03:38:39 2012 +0100 summary: Fixes `parser.clean()` reported in issue #16820. files: Doc/library/configparser.rst | 8 ++++++- Lib/configparser.py | 13 +++++++++++ Lib/test/test_cfgparser.py | 27 ++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -389,7 +389,13 @@ 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 --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -851,6 +851,19 @@ 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 --- a/Lib/test/test_cfgparser.py +++ b/Lib/test/test_cfgparser.py @@ -770,6 +770,33 @@ 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 -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merged fix for #15803 from 3.2 through 3.3
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/b4975cb4be95 changeset: 81163:b4975cb4be95 parent: 81160:e61381137b4a parent: 81162:cc277b25eae7 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 02:26:11 2012 +0100 summary: Merged fix for #15803 from 3.2 through 3.3 files: Lib/configparser.py | 7 +++---- Misc/ACKS | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/configparser.py b/Lib/configparser.py --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -99,10 +99,9 @@ yes, on for True). Returns False or True. items(section=_UNSET, raw=False, vars=None) - If section is given, return a list of tuples with (section_name, - section_proxy) for each section, including DEFAULTSECT. Otherwise, - return a list of tuples with (name, value) for each option - in the section. + If section is given, return a list of tuples with (name, value) for + each option in the section. Otherwise, return a list of tuples with + (section_name, section_proxy) for each section, including DEFAULTSECT. remove_section(section) Remove the given file section and all its options. diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1202,6 +1202,7 @@ Sandro Tosi Richard Townsend David Townshend +Nathan Trapuzzano Laurence Tratt Alberto Trevino Matthias Troffaes -- Repository URL: http://hg.python.org/cpython

1 0