Mercurial > cpython-lru_cache-weakref
diff Lib/ConfigParser.py @ 53109:83228bbe5906 2.6
Merged revisions 71537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71537 | georg.brandl | 2009-04-12 19:24:11 +0200 (So, 12 Apr 2009) | 1 line
#5741: dont disallow double percent signs in SafeConfigParser.set() keys.
........
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Sun, 12 Apr 2009 17:26:19 +0000 |
| parents | a7bf503c857e |
| children | 93d2befca0a5 |
line wrap: on
line diff
--- a/Lib/ConfigParser.py Sun Apr 12 17:02:55 2009 +0000 +++ b/Lib/ConfigParser.py Sun Apr 12 17:26:19 2009 +0000 @@ -614,7 +614,6 @@ return ''.join(L) _interpvar_re = re.compile(r"%\(([^)]+)\)s") - _badpercent_re = re.compile(r"%[^%]|%$") def _interpolate_some(self, option, accum, rest, section, map, depth): if depth > MAX_INTERPOLATION_DEPTH: @@ -661,9 +660,10 @@ # check for bad percent signs: # first, replace all "good" interpolations tmp_value = self._interpvar_re.sub('', value) + tmp_value = tmp_value.replace('%%', '') # then, check if there's a lone percent sign left - m = self._badpercent_re.search(tmp_value) - if m: + percent_index = tmp_value.find('%') + if percent_index != -1: raise ValueError("invalid interpolation syntax in %r at " - "position %d" % (value, m.start())) + "position %d" % (value, percent_index)) ConfigParser.set(self, section, option, value)