Unicode0.6.diff-2.5.1-zpt

File contents

--- Products/PageTemplates/PageTemplate.py.orig	Thu Mar 14 08:44:27 2002
+++ Products/PageTemplates/PageTemplate.py	Sun Aug  4 22:36:58 2002
@@ -24,7 +24,7 @@
 from TAL.TALInterpreter import TALInterpreter
 from Expressions import getEngine
 from string import join, strip, rstrip, split, replace, lower, find
-from cStringIO import StringIO
+from StringIO import StringIO
 from ExtensionClass import Base
 
 Z_DEBUG_MODE = os.environ.get('Z_DEBUG_MODE') == '1'
--- Products/PageTemplates/TALES.py.orig	Tue Jan 29 18:44:36 2002
+++ Products/PageTemplates/TALES.py	Sun Aug  4 22:33:43 2002
@@ -265,7 +265,7 @@
         text = self.evaluate(expr)
         if text is Default or text is None:
             return text
-        return str(text)
+        return ustr(text)
 
     def evaluateStructure(self, expr):
         return self.evaluate(expr)
--- TAL/TALInterpreter.py.orig	Fri Mar 15 18:46:53 2002
+++ TAL/TALInterpreter.py	Mon Aug  5 01:48:47 2002
@@ -19,15 +19,8 @@
 
 from cgi import escape
 from string import join, lower, rfind
-try:
-    from strop import lower, rfind
-except ImportError:
-    pass
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+
+from StringIO import StringIO
 
 from TALDefs import quote, TAL_VERSION, TALError, METALError
 from TALDefs import isCurrentVersion, getProgramVersion, getProgramMode
@@ -435,7 +428,7 @@
         if structure is self.Default:
             self.interpret(block)
             return
-        text = str(structure)
+        text = ustr(structure)
         if not (repldict or self.strictinsert):
             # Take a shortcut, no error checking
             self.stream_write(text)