diff Lib/ConfigParser.py @ 53131:93d2befca0a5 2.6

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. ........
author Georg Brandl <georg@python.org>
date Mon, 13 Apr 2009 12:37:59 +0000
parents 83228bbe5906
children e8fc9a9e1991
line wrap: on
line diff
--- a/Lib/ConfigParser.py	Mon Apr 13 12:35:51 2009 +0000
+++ b/Lib/ConfigParser.py	Mon Apr 13 12:37:59 2009 +0000
@@ -659,8 +659,8 @@
             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: