Log message for revision 68581:
Merge from trunk:
Log message for revision 68579:
* Added Five.browser.pagetemplatefile.ViewPageTemplateFile as an alias
to ZopeTwoPageTemplateFile and as a Zope 2 correspondence to
zope.app.pagetemplate.ViewPageTemplateFile.
Changed:
U Products.Five/branches/1.4/CHANGES.txt
U Products.Five/branches/1.4/browser/pagetemplatefile.py
-=-
Modified: Products.Five/branches/1.4/CHANGES.txt
===================================================================
--- Products.Five/branches/1.4/CHANGES.txt 2006-06-10 23:15:15 UTC (rev
68580)
+++ Products.Five/branches/1.4/CHANGES.txt 2006-06-10 23:17:31 UTC (rev
68581)
@@ -2,6 +2,13 @@
Five Changes
============
+Five 1.4.1 (unreleased)
+=======================
+
+* Added Five.browser.pagetemplatefile.ViewPageTemplateFile as an alias
+ to ZopeTwoPageTemplateFile and as a Zope 2 correspondence to
+ zope.app.pagetemplate.ViewPageTemplateFile.
+
Five 1.4 (2006-05-29)
=====================
Modified: Products.Five/branches/1.4/browser/pagetemplatefile.py
===================================================================
--- Products.Five/branches/1.4/browser/pagetemplatefile.py 2006-06-10
23:15:15 UTC (rev 68580)
+++ Products.Five/branches/1.4/browser/pagetemplatefile.py 2006-06-10
23:17:31 UTC (rev 68581)
@@ -21,9 +21,7 @@
from AccessControl import getSecurityManager
from Shared.DC.Scripts.Bindings import Unauthorized, UnauthorizedBinding
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-
from zope.app.pagetemplate.viewpagetemplatefile import ViewMapper
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from Products.Five.browser.ReuseUtils import rebindFunction
from Products.Five.browser.TrustedExpression import getEngine, ModuleImporter
@@ -95,3 +93,5 @@
pt_getContext = rebindFunction(_pt_getContext,
SecureModuleImporter=ModuleImporter)
+
+ViewPageTemplateFile = ZopeTwoPageTemplateFile
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
