[Python-checkins] python/dist/src/Lib string.py,1.85,1.86

nnorwitz at users.sourceforge.net nnorwitz at users.sourceforge.net
Sun Oct 17 18:27:20 CEST 2004


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv439/Lib

Modified Files:
	string.py 
Log Message:
Invalid patterns to substitute and safe_substitute would crash since pattern
is not a local variable.  Add a test case.


Index: string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/string.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- string.py	26 Sep 2004 18:56:44 -0000	1.85
+++ string.py	17 Oct 2004 16:27:17 -0000	1.86
@@ -167,7 +167,8 @@
                 return self.delimiter
             if mo.group('invalid') is not None:
                 self._invalid(mo)
-            raise ValueError('Unrecognized named group in pattern', pattern)
+            raise ValueError('Unrecognized named group in pattern',
+                             self.pattern)
         return self.pattern.sub(convert, self.template)
 
     def safe_substitute(self, *args, **kws):
@@ -199,7 +200,8 @@
                 return self.delimiter
             if mo.group('invalid') is not None:
                 self._invalid(mo)
-            raise ValueError('Unrecognized named group in pattern', pattern)
+            raise ValueError('Unrecognized named group in pattern',
+                             self.pattern)
         return self.pattern.sub(convert, self.template)
 
 



More information about the Python-checkins mailing list