Log message for revision 85387: Added a simple fix for the conflicting 'instance' keyword argument test failure.
Changed: U Zope/branches/philikon-aq/lib/python/Products/Five/browser/pagetemplatefile.py -=- Modified: Zope/branches/philikon-aq/lib/python/Products/Five/browser/pagetemplatefile.py =================================================================== --- Zope/branches/philikon-aq/lib/python/Products/Five/browser/pagetemplatefile.py 2008-04-15 20:38:59 UTC (rev 85386) +++ Zope/branches/philikon-aq/lib/python/Products/Five/browser/pagetemplatefile.py 2008-04-15 21:17:07 UTC (rev 85387) @@ -36,6 +36,22 @@ id = property(getId) + def __call__(self, __instance, *args, **keywords): + instance = __instance + namespace = self.pt_getContext( + request=instance.request, + instance=instance, args=args, options=keywords) + debug_flags = instance.request.debug + s = self.pt_render( + namespace, + showtal=getattr(debug_flags, 'showTAL', 0), + sourceAnnotations=getattr(debug_flags, 'sourceAnnotations', 0), + ) + response = instance.request.response + if not response.getHeader("Content-Type"): + response.setHeader("Content-Type", self.content_type) + return s + def pt_getEngine(self): return getEngine() _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins