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
7 changes: 5 additions & 2 deletions Lib/configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,12 @@ def _interpolate_some(self, parser, option, accum, rest, section, map,
if v is None:
continue
if "$" in v:
if sect == section:
submap = map
else:
submap = dict(parser.items(sect, raw=True))
self._interpolate_some(parser, opt, accum, v, sect,
dict(parser.items(sect, raw=True)),
depth + 1)
submap, depth + 1)
else:
accum.append(v)
else:
Expand Down
18 changes: 18 additions & 0 deletions Lib/test/test_configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,24 @@ def test_other_errors(self):
with self.assertRaises(ValueError):
cf['interpolation fail']['case6'] = "BLACK $ABBATH"

def test_get_with_vars_nested(self):
# gh-70999: honor vars at all levels of same-section interpolation
cf = self.fromstring(textwrap.dedent("""
[section]
a = ${b}
b = ${c}
c = default

[cross]
via = ${section:c}
""").strip())

eq = self.assertEqual
eq(cf.get('section', 'b', vars={'c': 'OVERRIDE'}), 'OVERRIDE')
eq(cf.get('section', 'a', vars={'c': 'OVERRIDE'}), 'OVERRIDE')
eq(cf.get('section', 'a'), 'default')
eq(cf.get('cross', 'via', vars={'c': 'OVERRIDE'}), 'default')
Comment thread
nikolauspschuetz marked this conversation as resolved.


class ConfigParserTestCaseNoValue(ConfigParserTestCase):
allow_no_value = True
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix :class:`configparser.ExtendedInterpolation` dropping caller-supplied
``vars`` during nested interpolation within a section. Patch by Nikolaus
Schuetz.
Loading