From: Georg Brandl <georg@python.org>
Date: Mon, 27 Apr 2009 16:43:36 +0000 (+0000)
Subject: Merged revisions 71564 via svnmerge from
X-Git-Tag: v3.1b1~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68998bf3ff432f35b54c63be82fe9711e830cedc;p=python

Merged revisions 71564 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71564 | georg.brandl | 2009-04-13 14:36:24 +0200 (Mo, 13 Apr 2009) | 1 line

  #5741 followup: should also allow %%(blah)s.
........
---

diff --git a/Lib/configparser.py b/Lib/configparser.py
index 4fc9a8d4e4..bfbe4cbe4e 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -665,8 +665,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: