? aaa.py
Index: Lib/string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/string.py,v
retrieving revision 1.86
diff -u -r1.86 string.py
--- Lib/string.py	17 Oct 2004 16:27:17 -0000	1.86
+++ Lib/string.py	29 Oct 2004 18:43:57 -0000
@@ -199,7 +199,7 @@
             if mo.group('escaped') is not None:
                 return self.delimiter
             if mo.group('invalid') is not None:
-                self._invalid(mo)
+                return '%s' % self.delimiter
             raise ValueError('Unrecognized named group in pattern',
                              self.pattern)
         return self.pattern.sub(convert, self.template)
Index: Lib/test/test_pep292.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pep292.py,v
retrieving revision 1.7
diff -u -r1.7 test_pep292.py
--- Lib/test/test_pep292.py	17 Oct 2004 16:27:18 -0000	1.7
+++ Lib/test/test_pep292.py	29 Oct 2004 18:43:58 -0000
@@ -163,20 +163,19 @@
         raises(TypeError, s.safe_substitute, d, {})
 
     def test_delimiter_override(self):
+        eq = self.assertEqual
+        raises = self.assertRaises
         class AmpersandTemplate(Template):
             delimiter = '&'
         s = AmpersandTemplate('this &gift is for &{who} &&')
-        self.assertEqual(s.substitute(gift='bud', who='you'),
-                         'this bud is for you &')
-        self.assertRaises(KeyError, s.substitute)
-        self.assertEqual(s.safe_substitute(gift='bud', who='you'),
-                         'this bud is for you &')
-        self.assertEqual(s.safe_substitute(),
-                         'this &gift is for &{who} &')
+        eq(s.substitute(gift='bud', who='you'), 'this bud is for you &')
+        raises(KeyError, s.substitute)
+        eq(s.safe_substitute(gift='bud', who='you'), 'this bud is for you &')
+        eq(s.safe_substitute(), 'this &gift is for &{who} &')
         s = AmpersandTemplate('this &gift is for &{who} &')
-        self.assertRaises(ValueError, s.substitute,
-                          dict(gift='bud', who='you'))
-        self.assertRaises(ValueError, s.safe_substitute)
+        raises(ValueError, s.substitute, dict(gift='bud', who='you'))
+        eq(s.safe_substitute(), 'this &gift is for &{who} &')
+
 
 def test_main():
     from test import test_support