[Python-checkins] python/dist/src/Lib string.py,1.83,1.84
bwarsaw at users.sourceforge.net
bwarsaw at users.sourceforge.net
Sat Sep 18 02:06:37 CEST 2004
Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22539
Modified Files:
string.py
Log Message:
At the cost of a modest (but useful in its own right) change in the semantics
of the Template.delimiter attribute, we make use of the delimiter in the
escaped group, and in the safe_substitute() method more robust.
Now, .delimiter should be the unescaped delimiter literal, e.g. '$' or '&', or
whatever. The _TemplateMetaclass will re.escape() this value when it builds
the pattern.
Index: string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/string.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- string.py 16 Sep 2004 00:09:11 -0000 1.83
+++ string.py 18 Sep 2004 00:06:34 -0000 1.84
@@ -113,7 +113,7 @@
pattern = cls.pattern
else:
pattern = _TemplateMetaclass.pattern % {
- 'delim' : cls.delimiter,
+ 'delim' : _re.escape(cls.delimiter),
'id' : cls.idpattern,
}
cls.pattern = _re.compile(pattern, _re.IGNORECASE | _re.VERBOSE)
@@ -123,7 +123,7 @@
"""A string class for supporting $-substitutions."""
__metaclass__ = _TemplateMetaclass
- delimiter = r'\$'
+ delimiter = '$'
idpattern = r'[_a-z][_a-z0-9]*'
def __init__(self, template):
@@ -152,7 +152,6 @@
mapping = _multimap(kws, args[0])
else:
mapping = args[0]
- delimiter = self.delimiter[-1]
# Helper function for .sub()
def convert(mo):
# Check the most common path first.
@@ -163,7 +162,7 @@
# fail if val is a Unicode containing non-ASCII characters.
return '%s' % val
if mo.group('escaped') is not None:
- return delimiter
+ return self.delimiter
if mo.group('invalid') is not None:
self._invalid(mo)
raise ValueError('Unrecognized named group in pattern', pattern)
@@ -178,7 +177,6 @@
mapping = _multimap(kws, args[0])
else:
mapping = args[0]
- delimiter = self.delimiter[-1]
# Helper function for .sub()
def convert(mo):
named = mo.group('named')
@@ -188,15 +186,15 @@
# will fail if val is a Unicode containing non-ASCII
return '%s' % mapping[named]
except KeyError:
- return delimiter + named
+ return self.delimiter + named
braced = mo.group('braced')
if braced is not None:
try:
return '%s' % mapping[braced]
except KeyError:
- return delimiter + '{' + braced + '}'
+ return self.delimiter + '{' + braced + '}'
if mo.group('escaped') is not None:
- return delimiter
+ return self.delimiter
if mo.group('invalid') is not None:
self._invalid(mo)
raise ValueError('Unrecognized named group in pattern', pattern)
More information about the Python-checkins
mailing list