[Zope-Checkins] CVS: Zope2 - DT_In.py:1.48.2.1
Andreas Jung
andreas@dhcp165.digicool.com
Thu, 19 Apr 2001 13:23:38 -0400
Update of /cvs-repository/Zope2/lib/python/DocumentTemplate
In directory yetix:/work/sandboxes/ajung-2_4-ts_regex-exterminiation-branch/lib/python/DocumentTemplate
Modified Files:
Tag: ajung-2_4-ts_regex-exterminiation-branch
DT_In.py
Log Message:
regex free
--- Updated File DT_In.py in package Zope2 --
--- DT_In.py 2001/04/13 19:31:42 1.48
+++ DT_In.py 2001/04/19 17:23:37 1.48.2.1
@@ -408,7 +408,7 @@
from DT_Util import ParseError, parse_params, name_param, str
from DT_Util import render_blocks, InstanceDict, ValidationError, VSEval, expr_globals
from string import find, atoi, join, split, lower
-import ts_regex
+import ts_regex,re
from DT_InSV import sequence_variables, opt
TupleType=type(())
@@ -471,11 +471,12 @@
if type(v)==type(''):
try: atoi(v)
except:
- self.start_name_re=ts_regex.compile(
+
+ self.start_name_re=re.compile(
'&+'+
join(map(lambda c: "[%s]" % c, v),'')+
'=[0-9]+&+')
-
+
name,expr=name_param(args,'in',1)
if expr is not None: expr=expr.eval
self.__name__, self.expr = name, expr