Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Georg Brandl 2009-04-27 16:42:58 +00:00
parent f3532df236
commit 1f9fa31cb5
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/configparser.py
View File

@ -620,7 +620,6 @@ class SafeConfigParser(ConfigParser):
return ''.join(L) return ''.join(L)
_interpvar_re = re.compile(r"%\(([^)]+)\)s") _interpvar_re = re.compile(r"%\(([^)]+)\)s")
_badpercent_re = re.compile(r"%[^%]|%$")
def _interpolate_some(self, option, accum, rest, section, map, depth): def _interpolate_some(self, option, accum, rest, section, map, depth):
if depth > MAX_INTERPOLATION_DEPTH: if depth > MAX_INTERPOLATION_DEPTH:
@ -667,9 +666,10 @@ class SafeConfigParser(ConfigParser):
# check for bad percent signs: # check for bad percent signs:
# first, replace all "good" interpolations # first, replace all "good" interpolations
tmp_value = self._interpvar_re.sub('', value) tmp_value = self._interpvar_re.sub('', value)
tmp_value = tmp_value.replace('%%', '')
# then, check if there's a lone percent sign left # then, check if there's a lone percent sign left
m = self._badpercent_re.search(tmp_value) percent_index = tmp_value.find('%')
if m: if percent_index != -1:
raise ValueError("invalid interpolation syntax in %r at " raise ValueError("invalid interpolation syntax in %r at "
"position %d" % (value, m.start())) "position %d" % (value, percent_index))
ConfigParser.set(self, section, option, value) ConfigParser.set(self, section, option, value)

4
Lib/test/test_cfgparser.py
View File

@ -424,6 +424,10 @@ class SafeConfigParserTestCase(ConfigParserTestCase):
self.assertEqual(cf.get('sect', "option1"), "foo") self.assertEqual(cf.get('sect', "option1"), "foo")
# bug #5741: double percents are *not* malformed
cf.set("sect", "option2", "foo%%bar")
self.assertEqual(cf.get("sect", "option2"), "foo%bar")
def test_set_nonstring_types(self): def test_set_nonstring_types(self):
cf = self.fromstring("[sect]\n" cf = self.fromstring("[sect]\n"
"option1=foo\n") "option1=foo\n")

3
Misc/NEWS
View File

@ -467,6 +467,9 @@ Library
- Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries. - Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries.
- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting
a value in SafeConfigParser.
- Issue #5732: added a new command in Distutils: check. - Issue #5732: added a new command in Distutils: check.
- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows - Issue #5731: Distutils bdist_wininst no longer worked on non-Windows