removed use of string/strop from TAL/TALInterpreter

Author: Richard Jones

roundup/cgi/TAL/TALInterpreter.py

@@ -19,11 +19,6 @@
 import getopt
 
 from cgi import escape
-from string import join, lower, rfind
-try:
-    from strop import lower, rfind
-except ImportError:
-    pass
 
 try:
     from cStringIO import StringIO
@@ -163,10 +158,9 @@ def __call__(self):
             self._stream_write("\n")
             self.col = 0
 
-    def stream_write(self, s,
-                     len=len, rfind=rfind):
+    def stream_write(self, s, len=len):
         self._stream_write(s)
-        i = rfind(s, '\n')
+        i = s.rfind('\n')
         if i < 0:
             self.col = self.col + len(s)
         else:
@@ -272,7 +266,7 @@ def attrAction(self, item):
             # Clear 'entering' flag
             macs[-1][2] = 0
             # Convert or drop depth-one METAL attributes.
-            i = rfind(name, ":") + 1
+            i = name.rfind(":") + 1
             prefix, suffix = name[:i], name[i:]
             if suffix == "define-macro":
                 # Convert define-macro as we enter depth one.
@@ -296,7 +290,7 @@ def attrAction_tal(self, item):
         if action > 1:
             return self.attrAction(item)
         ok = 1
-        if self.html and lower(name) in BOOLEAN_HTML_ATTRS:
+        if self.html and name.lower() in BOOLEAN_HTML_ATTRS:
             evalue = self.engine.evaluateBoolean(item[3])
             if evalue is self.Default:
                 if action == 1: # Cancelled insert
@@ -424,7 +418,7 @@ def do_insertText_tal(self, stuff):
             return
         s = escape(text)
         self._stream_write(s)
-        i = rfind(s, '\n')
+        i = s.rfind('\n')
         if i < 0:
             self.col = self.col + len(s)
         else: