[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate - __init__.py:1.18 DT_Util.py:1.91 DT_String.py:1.52 DT_Return.py:1.8

[Jeremy Hylton]

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

Modified Files:
	__init__.py DT_Util.py DT_String.py DT_Return.py 
Log Message:
Remove unused imports and other small cleanups.

The ExtensionClass imports mentions something about an import lock
problem, but provides no details.  The tests seem unaffected, so I'm
guessing this had to do with the old extension class that was a C
extension.


=== Zope/lib/python/DocumentTemplate/__init__.py 1.17 => 1.18 ===
--- Zope/lib/python/DocumentTemplate/__init__.py:1.17	Wed Aug 14 18:29:53 2002
+++ Zope/lib/python/DocumentTemplate/__init__.py	Fri Dec 26 18:43:11 2003
@@ -18,5 +18,4 @@
 $Id$'''
 __version__='$Revision$'[11:-2]
 
-import ExtensionClass # work-around for import bug.
 from DocumentTemplate import String, File, HTML, HTMLDefault, HTMLFile


=== Zope/lib/python/DocumentTemplate/DT_Util.py 1.90 => 1.91 ===
--- Zope/lib/python/DocumentTemplate/DT_Util.py:1.90	Fri Nov 28 11:45:22 2003
+++ Zope/lib/python/DocumentTemplate/DT_Util.py	Fri Dec 26 18:43:11 2003
@@ -13,7 +13,8 @@
 '''$Id$'''
 __version__='$Revision$'[11:-2]
 
-import re, os
+import re
+
 from html_quote import html_quote, ustr # for import by other modules, dont remove!
 from RestrictedPython.Guards import safe_builtins
 from RestrictedPython.Utilities import utility_builtins
@@ -29,17 +30,17 @@
 from zExceptions import Unauthorized as ValidationError
 
 def int_param(params,md,name,default=0, st=type('')):
-    try: v=params[name]
-    except: v=default
+    v = params.get(name, default)
     if v:
-        try: v=int(v)
+        try:
+            v = int(v)
         except:
-            v=md[v]
-            if type(v) is st: v=int(v)
+            v = md[v]
+            if isinstance(v, str):
+                v = int(v)
     return v or 0
 
 try:
-    import ExtensionClass
     from cDocumentTemplate import InstanceDict, TemplateDict, \
          render_blocks, safe_callable, join_unicode
 except:


=== Zope/lib/python/DocumentTemplate/DT_String.py 1.51 => 1.52 ===
--- Zope/lib/python/DocumentTemplate/DT_String.py:1.51	Wed Aug 14 18:29:52 2002
+++ Zope/lib/python/DocumentTemplate/DT_String.py	Fri Dec 26 18:43:11 2003
@@ -12,7 +12,9 @@
 ##############################################################################
 "$Id$"
 
-import thread,re,exceptions,os
+import os
+import thread
+import re
 
 from DT_Util import ParseError, InstanceDict, TemplateDict, render_blocks, str
 from DT_Var import Var, Call, Comment


=== Zope/lib/python/DocumentTemplate/DT_Return.py 1.7 => 1.8 ===
--- Zope/lib/python/DocumentTemplate/DT_Return.py:1.7	Wed Aug 14 18:29:52 2002
+++ Zope/lib/python/DocumentTemplate/DT_Return.py	Fri Dec 26 18:43:11 2003
@@ -12,8 +12,7 @@
 ##############################################################################
 __version__='$Revision$'[11:-2]
 
-from DT_Util import parse_params, name_param, str
-import  sys
+from DT_Util import parse_params, name_param
 
 class ReturnTag:
     name='return'
@@ -21,21 +20,20 @@
 
     def __init__(self, args):
         args = parse_params(args, name='', expr='')
-        name, expr = name_param(args,'var',1)
-        self.__name__, self.expr = name, expr
+        name, expr = name_param(args, 'var', 1)
+        self.__name__ = name
+        self.expr = expr
 
     def render(self, md):
-        name=self.__name__
-        val=self.expr
         if val is None:
-            val = md[name]
+            val = md[self.__name__]
         else:
-            val=val.eval(md)
+            val = self.expr.eval(md)
 
         raise DTReturn(val)
 
-    __call__=render
+    __call__ = render
 
 class DTReturn:
     def __init__(self, v):
-        self.v=v
+        self.v = v