[Python-checkins] r72026 - in python/branches/py3k: Lib/configparser.py

Mon Apr 27 18:43:37 CEST 2009

Author: georg.brandl
Date: Mon Apr 27 18:43:36 2009
New Revision: 72026
Log:
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.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/configparser.py
Modified: python/branches/py3k/Lib/configparser.py
==============================================================================

--- python/branches/py3k/Lib/configparser.py	(original)
+++ python/branches/py3k/Lib/configparser.py	Mon Apr 27 18:43:36 2009
@@ -665,8 +665,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:
