[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - Expressions.py:1.36.4.3 GlobalTranslationService.py:1.2.2.2 PageTemplate.py:1.25.4.3 PageTemplateFile.py:1.19.4.3 PythonExpr.py:1.8.4.2 TALES.py:1.31.4.2 ZopePageTemplate.py:1.42.4.5

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv20268/lib/python/Products/PageTemplates

Modified Files:
      Tag: chrism-install-branch
	Expressions.py GlobalTranslationService.py PageTemplate.py 
	PageTemplateFile.py PythonExpr.py TALES.py ZopePageTemplate.py 
Log Message:
Merging HEAD into chrism-install-branch.


=== Zope/lib/python/Products/PageTemplates/Expressions.py 1.36.4.2 => 1.36.4.3 ===


=== Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py 1.2.2.1 => 1.2.2.2 ===
--- Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py:1.2.2.1	Sat Sep 28 21:40:32 2002
+++ Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py	Tue Oct  8 14:41:07 2002
@@ -17,10 +17,10 @@
 """
 
 class DummyTranslationService:
-    """Translation service that does nothing and returns the message id."""
+    """Translation service that doesn't know anything about translation."""
     def translate(self, domain, msgid, mapping=None,
                   context=None, target_language=None):
-        return msgid
+        return None
     # XXX Not all of Zope.I18n.ITranslationService is implemented.
 
 translationService = DummyTranslationService()


=== Zope/lib/python/Products/PageTemplates/PageTemplate.py 1.25.4.2 => 1.25.4.3 ===
--- Zope/lib/python/Products/PageTemplates/PageTemplate.py:1.25.4.2	Mon Sep 16 02:00:51 2002
+++ Zope/lib/python/Products/PageTemplates/PageTemplate.py	Tue Oct  8 14:41:07 2002
@@ -43,11 +43,6 @@
     _text = ''
     _error_start = '<!-- Page Template Diagnostics'
 
-    def StringIO(self):
-        # Third-party products wishing to provide a full Unicode-aware
-        # StringIO can do so by monkey-patching this method.
-        return StringIO()
-
     def macros(self):
         return self.pt_macros()
     macros = ComputedAttribute(macros, 1)
@@ -85,7 +80,7 @@
 
         if self._v_errors:
             raise PTRuntimeError, 'Page Template %s has errors.' % self.id
-        output = self.StringIO()
+        output = StringIO()
         c = self.pt_getContext()
         c.update(extra_context)
 
@@ -131,7 +126,7 @@
     def write(self, text):
         assert type(text) is type('')
         if text[:len(self._error_start)] == self._error_start:
-            errend = text.find('-->')
+            errend = find(text, '-->')
             if errend >= 0:
                 text = text[errend + 4:]
         if self._text != text:


=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.19.4.2 => 1.19.4.3 ===


=== Zope/lib/python/Products/PageTemplates/PythonExpr.py 1.8.4.1 => 1.8.4.2 ===


=== Zope/lib/python/Products/PageTemplates/TALES.py 1.31.4.1 => 1.31.4.2 ===


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.42.4.4 => 1.42.4.5 ===