Commit 8c4da53a authored by Fred Drake's avatar Fred Drake

Make both items() methods return lists; one had changed to return an

iterator where it probably shouldn't have.
Closes SF bug #818861.
parent de05032c
...@@ -542,12 +542,11 @@ class ConfigParser(RawConfigParser): ...@@ -542,12 +542,11 @@ class ConfigParser(RawConfigParser):
if "__name__" in options: if "__name__" in options:
options.remove("__name__") options.remove("__name__")
if raw: if raw:
for option in options: return [(option, d[option])
yield (option, d[option]) for option in options]
else: else:
for option in options: return [(option, self._interpolate(section, option, d[option], d))
yield (option, for option in options]
self._interpolate(section, option, d[option], d))
def _interpolate(self, section, option, rawval, vars): def _interpolate(self, section, option, rawval, vars):
# do the string interpolation # do the string interpolation
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment