[Python-checkins] r71538 - in python/branches/release26-maint: Lib/ConfigParser.py Lib/test/test_cfgparser.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Sun Apr 12 19:26:19 2009
New Revision: 71538

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

........
  r71537 | georg.brandl | 2009-04-12 19:24:11 +0200 (So, 12 Apr 2009) | 1 line
  
  #5741: dont disallow double percent signs in SafeConfigParser.set() keys.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/ConfigParser.py
   python/branches/release26-maint/Lib/test/test_cfgparser.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/ConfigParser.py
==============================================================================
--- python/branches/release26-maint/Lib/ConfigParser.py	(original)
+++ python/branches/release26-maint/Lib/ConfigParser.py	Sun Apr 12 19:26:19 2009
@@ -614,7 +614,6 @@
         return ''.join(L)
 
     _interpvar_re = re.compile(r"%\(([^)]+)\)s")
-    _badpercent_re = re.compile(r"%[^%]|%$")
 
     def _interpolate_some(self, option, accum, rest, section, map, depth):
         if depth > MAX_INTERPOLATION_DEPTH:
@@ -661,9 +660,10 @@
         # check for bad percent signs:
         # first, replace all "good" interpolations
         tmp_value = self._interpvar_re.sub('', value)
+        tmp_value = tmp_value.replace('%%', '')
         # then, check if there's a lone percent sign left
-        m = self._badpercent_re.search(tmp_value)
-        if m:
+        percent_index = tmp_value.find('%')
+        if percent_index != -1:
             raise ValueError("invalid interpolation syntax in %r at "
-                             "position %d" % (value, m.start()))
+                             "position %d" % (value, percent_index))
         ConfigParser.set(self, section, option, value)

Modified: python/branches/release26-maint/Lib/test/test_cfgparser.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_cfgparser.py	(original)
+++ python/branches/release26-maint/Lib/test/test_cfgparser.py	Sun Apr 12 19:26:19 2009
@@ -434,6 +434,10 @@
 
         self.assertEqual(cf.get('sect', "option1"), "foo")
 
+        # bug #5741: double percents are *not* malformed
+        cf.set("sect", "option2", "foo%%bar")
+        self.assertEqual(cf.get("sect", "option2"), "foo%bar")
+
     def test_set_nonstring_types(self):
         cf = self.fromstring("[sect]\n"
                              "option1=foo\n")

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Apr 12 19:26:19 2009
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #5741: don't disallow "%%" (which is an escape for "%") when setting
+  a value in SafeConfigParser.
+
 - Issue #5731: Distutils bdist_wininst no longer worked on non-Windows 
   platforms. Initial patch by Paul Moore.