Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Lib/configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ def __init__(self, defaults=None, dict_type=_default_dict,
self._optcre = re.compile(self._OPT_TMPL.format(delim=d),
re.VERBOSE)
self._comments = _CommentSpec(comment_prefixes or (), inline_comment_prefixes or ())
self._loaded_sources = []
self._strict = strict
self._allow_no_value = allow_no_value
self._empty_lines_in_values = empty_lines_in_values
Expand All @@ -690,6 +691,7 @@ def __init__(self, defaults=None, dict_type=_default_dict,
self._read_defaults(defaults)
self._allow_unnamed_section = allow_unnamed_section


Comment thread
Agent-Hellboy marked this conversation as resolved.
def defaults(self):
return self._defaults

Expand Down Expand Up @@ -1048,6 +1050,40 @@ def __iter__(self):
# XXX does it break when underlying container state changed?
return itertools.chain((self.default_section,), self._sections.keys())

def __str__(self):
config_dict = {
section: {key: value for key, value in self.items(section, raw=True)}
Comment thread
Agent-Hellboy marked this conversation as resolved.
for section in self.sections()
}
return f"<ConfigParser: {config_dict}>"


Comment thread
Agent-Hellboy marked this conversation as resolved.
def __repr__(self):
params = {
"defaults": self._defaults if self._defaults else None,
"dict_type": type(self._dict).__name__,
"allow_no_value": self._allow_no_value,
"delimiters": self._delimiters,
"strict": self._strict,
"default_section": self.default_section,
"interpolation": type(self._interpolation).__name__,
}
params = {k: v for k, v in params.items() if v is not None}
sections_count = len(self._sections)
state = {
"loaded_sources": self._loaded_sources,
"sections_count": len(self._sections),
"sections": list(self._sections.keys())[:5], # Limit to 5 section names for readability
}

if sections_count > 5:
state["sections_truncated"] = f"...and {sections_count - 5} more"

return (f"<{self.__class__.__name__}("
f"params={params}, "
f"state={state})>")

Comment thread
Agent-Hellboy marked this conversation as resolved.

def _read(self, fp, fpname):
"""Parse a sectioned configuration file.

Expand All @@ -1068,6 +1104,7 @@ def _read(self, fp, fpname):
try:
ParsingError._raise_all(self._read_inner(fp, fpname))
finally:
self._loaded_sources.append(fpname)
self._join_multiline_values()

def _read_inner(self, fp, fpname):
Expand Down
56 changes: 50 additions & 6 deletions Lib/test/test_configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -980,18 +980,62 @@ def test_set_nonstring_types(self):
self.assertRaises(TypeError, cf.set, "sect", 123, "invalid opt name!")
self.assertRaises(TypeError, cf.add_section, 123)

def test_str(self):
self.maxDiff = None
cf = self.config_class(allow_no_value=True, delimiters=('=',), strict=True)
cf.add_section("sect1")
cf.add_section("sect2")
Comment thread
picnixz marked this conversation as resolved.
cf.set("sect1", "option1", "foo")
cf.set("sect2", "option2", "bar")

expected_str = (
"<ConfigParser: {'sect1': {'option1': 'foo'}, 'sect2': {'option2': 'bar'}}>"
)
self.assertEqual(str(cf), expected_str)

def test_repr(self):
self.maxDiff = None
cf = self.config_class(allow_no_value=True, delimiters=('=',), strict=True)
cf.add_section("sect1")
cf.add_section("sect2")
cf.add_section("sect3")
cf.add_section("sect4")
cf.add_section("sect5")
cf.add_section("sect6")
cf.set("sect1", "option1", "foo")
cf.set("sect2", "option2", "bar")
cf.read_string("") # to trigger the loading of sources

Comment thread
Agent-Hellboy marked this conversation as resolved.
dict_type = type(cf._dict).__name__
params = {
'dict_type': dict_type,
'allow_no_value': True,
'delimiters': ('=',),
'strict': True,
'default_section': 'DEFAULT',
'interpolation': 'BasicInterpolation',
}
state = {
'loaded_sources': ['<string>'],
'sections_count': 6,
'sections': ['sect1', 'sect2', 'sect3', 'sect4', 'sect5'],
'sections_truncated': '...and 1 more',
}
expected = f"<{type(cf).__name__}({params=}, {state=})>"
self.assertEqual(repr(cf), expected)

def test_add_section_default(self):
cf = self.newconfig()
self.assertRaises(ValueError, cf.add_section, self.default_section)

def test_defaults_keyword(self):
"""bpo-23835 fix for ConfigParser"""
cf = self.newconfig(defaults={1: 2.4})
self.assertEqual(cf[self.default_section]['1'], '2.4')
self.assertAlmostEqual(cf[self.default_section].getfloat('1'), 2.4)
cf = self.newconfig(defaults={"A": 5.2})
self.assertEqual(cf[self.default_section]['a'], '5.2')
self.assertAlmostEqual(cf[self.default_section].getfloat('a'), 5.2)
cf = self.newconfig(defaults={1: 2.5})
self.assertEqual(cf[self.default_section]['1'], '2.5')
self.assertAlmostEqual(cf[self.default_section].getfloat('1'), 2.5)
cf = self.newconfig(defaults={"A": 5.25})
self.assertEqual(cf[self.default_section]['a'], '5.25')
self.assertAlmostEqual(cf[self.default_section].getfloat('a'), 5.25)


class ConfigParserTestCaseNoInterpolation(BasicTestCase, unittest.TestCase):
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,7 @@ Joel Rosdahl
Erik Rose
Mark Roseman
Josh Rosenberg
Prince Roshan
Comment thread
picnixz marked this conversation as resolved.
Jim Roskind
Brian Rosner
Ignacio Rossi
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Implement :meth:`~object.__str__` and :meth:`~object.__repr__`
for :class:`configparser.RawConfigParser` objects.
Loading