summaryrefslogtreecommitdiff
path: root/Lib/ConfigParser.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-13 12:37:59 +0000
committerGeorg Brandl <georg@python.org>2009-04-13 12:37:59 +0000
commit59e93c96526d089a3aab72592ca9ceea5ff80c78 (patch)
tree9a0420ec40fa6d961263e49c661c4938f77d31d0 /Lib/ConfigParser.py
parent6c40b32338aa5659ec33e503a5163614f79d1633 (diff)
downloadcpython-git-59e93c96526d089a3aab72592ca9ceea5ff80c78.tar.gz
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. ........
Diffstat (limited to 'Lib/ConfigParser.py')
-rw-r--r--Lib/ConfigParser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py
index aa4f196fa4..d02b74dc9b 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: