[Zope3-checkins] CVS: Zope3/src/zope/tal - taldefs.py:1.8

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zope/tal
In directory cvs.zope.org:/tmp/cvs-serv28992/src/zope/tal

Modified Files:
	taldefs.py 
Log Message:
Fix various import issues.

Some names where from imported twice.
Other imports were unused.
Often imports were in partly random order, making them harder to read.


=== Zope3/src/zope/tal/taldefs.py 1.7 => 1.8 ===
--- Zope3/src/zope/tal/taldefs.py:1.7	Thu Aug 21 10:19:29 2003
+++ Zope3/src/zope/tal/taldefs.py	Mon Nov  3 23:04:22 2003
@@ -15,6 +15,7 @@
 Common definitions used by TAL and METAL compilation an transformation.
 """
 
+import re
 from zope.tal.interfaces import ITALExpressionErrorInfo
 from zope.interface import implements
 
@@ -107,10 +108,8 @@
         self.offset = position[1]
 
 
-import re
 _attr_re = re.compile(r"\s*([^\s]+)\s+([^\s].*)\Z", re.S)
 _subst_re = re.compile(r"\s*(?:(text|structure)\s+)?(.*)\Z", re.S)
-del re
 
 def parseAttributeReplacements(arg, xml):
     dict = {}
@@ -166,13 +165,11 @@
             return version
     return None
 
-import re
 _ent1_re = re.compile('&(?![A-Z#])', re.I)
 _entch_re = re.compile('&([A-Z][A-Z0-9]*)(?![A-Z0-9;])', re.I)
 _entn1_re = re.compile('&#(?![0-9X])', re.I)
 _entnx_re = re.compile('&(#X[A-F0-9]*)(?![A-F0-9;])', re.I)
 _entnd_re = re.compile('&(#[0-9][0-9]*)(?![0-9;])')
-del re
 
 def attrEscape(s):
     """Replace special characters '&<>' by character entities,