From acaad640e0e866cf393a3d53c4be1f5ea4b2dc41 Mon Sep 17 00:00:00 2001 From: richard Date: Sat, 16 Nov 2002 07:43:22 +0000 Subject: [PATCH] removed use of string/strop from TAL/TALInterpreter git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1383 57a73879-2fb5-44c3-a270-3262357dd7e2 --- roundup/cgi/TAL/TALInterpreter.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/roundup/cgi/TAL/TALInterpreter.py b/roundup/cgi/TAL/TALInterpreter.py index 0f42284..be6d11e 100644 --- a/roundup/cgi/TAL/TALInterpreter.py +++ b/roundup/cgi/TAL/TALInterpreter.py @@ -19,11 +19,6 @@ import sys 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 @@ class TALInterpreter: 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 @@ class TALInterpreter: # 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 @@ class TALInterpreter: 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 @@ class TALInterpreter: 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: -- 2.30.2