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.
........
diff --git a/Lib/configparser.py b/Lib/configparser.py
index 7510a6e..4fc9a8d 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -620,7 +620,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:
@@ -667,9 +666,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)
diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index a8418ca..12fd00c 100644
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -424,6 +424,10 @@
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):
cf = self.fromstring("[sect]\n"
"option1=foo\n")
diff --git a/Misc/NEWS b/Misc/NEWS
index 217276f..44fbc47 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -467,6 +467,9 @@
- 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 #5731: Distutils bdist_wininst no longer worked on non-Windows