Improve coding a little

Author: J. David Ibanez

GettextTag.py

@@ -24,9 +24,6 @@
 </dtml-gettext>
 """
 
-# Import from the Standard Library
-from types import StringType
-
 # Import from Zope
 from DocumentTemplate.DT_Util import Eval, ParseError, parse_params, \
      InstanceDict, namespace, render_blocks
@@ -47,12 +44,6 @@ def name_or_expr(mapping, name_attr, expr_attr, default):
     raise ParseError, ('%s and %s given' % (name_attr, expr_attr), 'calendar')
 
 
-def get_value(x, md):
-    if x is None or type(x) is StringType:
-        return x
-    else:
-        return x.eval(md)
-
 
 class GettextTag:
     """ """
@@ -81,7 +72,9 @@ def __init__(self, blocks):
 
     def __call__(self, md):
         # In which language, if any?
-        lang = get_value(self.lang, md)
+        lang = self.lang
+        if lang is not None and type(lang) is not str:
+            lang = lang.eval(md)
 
         # Get the message!!
         ns = namespace(md)[0]

LocalContent.py

@@ -15,11 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Import from the Standard Library
-from cgi import escape
-from cStringIO import StringIO
 from hashlib import md5
-from types import StringType, UnicodeType
-from xml.sax import make_parser, handler, InputSource
 
 # Import from itools
 from itools.datatypes import LanguageTag

LocalPropertyManager.py

@@ -303,10 +303,9 @@ def manage_upgrade(self, REQUEST=None, RESPONSE=None):
         # The upgrade code below must be activated once the new upgrade
         # framework is deployed, something that should happen for the 1.2
         # release.
-##        from types import TupleType
 ##        for k, v in self._local_properties.items():
 ##            for i, j in v.items():
-##                if type(j) is not TupleType:
+##                if type(j) is not tuple:
 ##                    # XXX add the timestamp for every property
 ##                    self._local_properties[k][i] = (j, time())
 ##        self._p_changed = 1