mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-23835: Restore legacy defaults= behavior for RawConfigParser (#3191)

Browse source 
The fix for bpo-23835 fixed ConfigParser behavior in defaults= handling.
Unfortunately, it caused a backwards compatibility regression with
RawConfigParser objects which allow for non-string values.

This commit restores the legacy behavior for RawConfigParser only.
This commit is contained in:
Łukasz Langa 2017-08-24 09:43:53 -07:00 • committed by GitHub
parent a6296d34a4
commit a5fab17fc1
3 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/configparser.py
View file

@ -635,7 +635,7 @@ class RawConfigParser(MutableMapping):
if converters is not _UNSET:
self._converters.update(converters)
if defaults:
self.read_dict({default_section: defaults})
self._read_defaults(defaults)
def defaults(self):
return self._defaults
@ -1121,6 +1121,12 @@ class RawConfigParser(MutableMapping):
section,
name, val)
def _read_defaults(self, defaults):
"""Read the defaults passed in the initializer.
Note: values can be non-string."""
for key, value in defaults.items():
self._defaults[self.optionxform(key)] = value
def _handle_error(self, exc, fpname, lineno, line):
if not exc:
exc = ParsingError(fpname)
@ -1198,6 +1204,11 @@ class ConfigParser(RawConfigParser):
self._validate_value_types(section=section)
super().add_section(section)
def _read_defaults(self, defaults):
"""Reads the defaults passed in the initializer, implicitly converting
values to strings like the rest of the API."""
self.read_dict({self.default_section: defaults})
class SafeConfigParser(ConfigParser):
"""ConfigParser alias for backwards compatibility purposes."""