[Zope3-checkins] CVS: Zope3/src/zope/pagetemplate - pagetemplate.py:1.7.14.1

Grégoire Weber zope@i-con.ch
Sun, 22 Jun 2003 10:24:16 -0400


Update of /cvs-repository/Zope3/src/zope/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/pagetemplate

Modified Files:
      Tag: cw-mail-branch
	pagetemplate.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/pagetemplate/pagetemplate.py 1.7 => 1.7.14.1 ===
--- Zope3/src/zope/pagetemplate/pagetemplate.py:1.7	Tue Apr 15 17:19:20 2003
+++ Zope3/src/zope/pagetemplate/pagetemplate.py	Sun Jun 22 10:23:46 2003
@@ -25,7 +25,6 @@
 from zope.tal.talgenerator import TALGenerator
 from zope.tal.talinterpreter import TALInterpreter
 from zope.tales.engine import Engine
-from zope.pagetemplate.interfaces import IMacrosAttribute
 # Don't use cStringIO here!  It's not unicode aware.
 from StringIO import StringIO
 
@@ -62,11 +61,6 @@
         passed to the TALES expression engine, then calls pt_render()
         to perform the rendering.
     """
-
-    # XXX this breaks something in the Zope3 views registries.
-    # Temporarily removed. SteveA 2002-10-22
-    #__implements__ = IMacrosAttribute
-
     content_type = 'text/html'
     expand = 1
     _v_errors = ()
@@ -229,7 +223,7 @@
 
 
 class PageTemplateTracebackSupplement:
-    #__implements__ = ITracebackSupplement
+    #implements(ITracebackSupplement)
 
     def __init__(self, pt, namespace):
         self.manageable_object = pt