From 59e93c96526d089a3aab72592ca9ceea5ff80c78 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 13 Apr 2009 12:37:59 +0000 Subject: [PATCH] Merged revisions 71564 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r71564 | georg.brandl | 2009-04-13 12:36:24 +0000 (Mo, 13 Apr 2009) | 1 line #5741 followup: should also allow %%(blah)s. ........ --- Lib/ConfigParser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py index aa4f196fa44..d02b74dc9ba 100644 --- a/Lib/ConfigParser.py +++ b/Lib/ConfigParser.py @@ -659,8 +659,8 @@ class SafeConfigParser(ConfigParser): raise TypeError("option values must be strings") # check for bad percent signs: # first, replace all "good" interpolations - tmp_value = self._interpvar_re.sub('', value) - tmp_value = tmp_value.replace('%%', '') + tmp_value = value.replace('%%', '') + tmp_value = self._interpvar_re.sub('', tmp_value) # then, check if there's a lone percent sign left percent_index = tmp_value.find('%') if percent_index != -1: