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

iterator where it probably shouldn't have.
Closes SF bug #818861.
This commit is contained in:
Fred Drake 2003-10-21 16:45:00 +00:00
parent de05032cc9
commit 8c4da53afe
1 changed files with 4 additions and 5 deletions

View File

@ -542,12 +542,11 @@ def items(self, section, raw=False, vars=None):
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