[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate - DT_UI.py:1.12.4.6 DT_Var.py:1.57.4.3 pDocumentTemplate.py:1.36.4.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/DocumentTemplate
In directory cvs.zope.org:/tmp/cvs-serv17057/lib/python/DocumentTemplate

Modified Files:
      Tag: chrism-install-branch
	DT_UI.py DT_Var.py pDocumentTemplate.py 
Log Message:
More merges from HEAD.


=== Zope/lib/python/DocumentTemplate/DT_UI.py 1.12.4.5 => 1.12.4.6 ===


=== Zope/lib/python/DocumentTemplate/DT_Var.py 1.57.4.2 => 1.57.4.3 ===


=== Zope/lib/python/DocumentTemplate/pDocumentTemplate.py 1.36.4.1 => 1.36.4.2 ===
--- Zope/lib/python/DocumentTemplate/pDocumentTemplate.py:1.36.4.1	Tue Oct  8 14:41:06 2002
+++ Zope/lib/python/DocumentTemplate/pDocumentTemplate.py	Tue Oct  8 17:45:48 2002
@@ -10,13 +10,14 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Python implementations of document template some features
+"""Python implementations of document template some features
 
-
-$Id$'''
+$Id$"""
 __version__='$Revision$'[11:-2]
 
-import  sys, types
+import sys, types
+from types import StringType, UnicodeType, TupleType
+from ustr import ustr
 
 ClassTypes = [types.ClassType]
 
@@ -39,12 +40,6 @@
     else:
         return callable(ob)
 
-
-StringType=type('')
-UnicodeType=type(u'')
-TupleType=type(())
-
-
 class InstanceDict:
 
     guarded_getattr=None
@@ -97,8 +92,11 @@
 
     def __getitem__(self, key):
         for d in self.dicts:
-            try: return d[key]
-            except KeyError, AttributeError: pass
+            try:
+                return d[key]
+            except (KeyError, AttributeError):
+                # XXX How do we get an AttributeError?
+                pass
         raise KeyError, key
 
     def push(self,d): self.dicts.insert(0,d)