[Checkins] SVN: CompositePage/trunk/ zope.pagetemplate.pagetemplatefile does not provide the required __name__ attribute. Go back.

[Shane Hathaway]

Log message for revision 121403:
  zope.pagetemplate.pagetemplatefile does not provide the required __name__ attribute.  Go back.
  
  

Changed:
  U   CompositePage/trunk/composite.py
  U   CompositePage/trunk/designuis.py
  U   CompositePage/trunk/element.py
  U   CompositePage/trunk/slot.py
  U   CompositePage/trunk/slotclass.py

-=-
Modified: CompositePage/trunk/composite.py
===================================================================
--- CompositePage/trunk/composite.py	2011-04-11 23:46:03 UTC (rev 121402)
+++ CompositePage/trunk/composite.py	2011-04-12 00:52:12 UTC (rev 121403)
@@ -26,11 +26,11 @@
 from Acquisition import aq_get
 from OFS.Folder import Folder
 from OFS.SimpleItem import SimpleItem
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from AccessControl import ClassSecurityInfo
 from AccessControl.ZopeGuards import guarded_getattr
 from zope.interface import implements
-from zope.pagetemplate.pagetemplatefile import PageTemplateFile
 
 from Products.CompositePage.interfaces import IComposite
 from Products.CompositePage.interfaces import ISlot

Modified: CompositePage/trunk/designuis.py
===================================================================
--- CompositePage/trunk/designuis.py	2011-04-11 23:46:03 UTC (rev 121402)
+++ CompositePage/trunk/designuis.py	2011-04-12 00:52:12 UTC (rev 121403)
@@ -22,7 +22,7 @@
 import Globals
 from Acquisition import aq_base, aq_inner, aq_parent
 from OFS.SimpleItem import SimpleItem
-from zope.pagetemplate.pagetemplatefile import PageTemplateFile
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from AccessControl import ClassSecurityInfo
 from AccessControl.ZopeGuards import guarded_getattr
 

Modified: CompositePage/trunk/element.py
===================================================================
--- CompositePage/trunk/element.py	2011-04-11 23:46:03 UTC (rev 121402)
+++ CompositePage/trunk/element.py	2011-04-12 00:52:12 UTC (rev 121403)
@@ -22,8 +22,9 @@
 from Acquisition import aq_get
 from OFS.SimpleItem import SimpleItem
 from OFS.PropertyManager import PropertyManager
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from DocumentTemplate.DT_Util import safe_callable
-from zope.pagetemplate.pagetemplatefile import PageTemplateFile
+
 from zope.interface import implements
 
 from Products.CompositePage.interfaces import ICompositeElement

Modified: CompositePage/trunk/slot.py
===================================================================
--- CompositePage/trunk/slot.py	2011-04-11 23:46:03 UTC (rev 121402)
+++ CompositePage/trunk/slot.py	2011-04-12 00:52:12 UTC (rev 121403)
@@ -27,7 +27,7 @@
 from Acquisition import aq_get
 from ZODB.POSException import ConflictError
 from OFS.SimpleItem import SimpleItem
-from zope.pagetemplate.pagetemplatefile import PageTemplateFile
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from AccessControl import ClassSecurityInfo
 from zLOG import LOG, ERROR
 from zope.interface import implements

Modified: CompositePage/trunk/slotclass.py
===================================================================
--- CompositePage/trunk/slotclass.py	2011-04-11 23:46:03 UTC (rev 121402)
+++ CompositePage/trunk/slotclass.py	2011-04-12 00:52:12 UTC (rev 121403)
@@ -21,7 +21,7 @@
 from Acquisition import aq_inner, aq_parent
 from OFS.SimpleItem import SimpleItem
 from OFS.PropertyManager import PropertyManager
-from zope.pagetemplate.pagetemplatefile import PageTemplateFile
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import implements
 
 from Products.CompositePage.interfaces import ISlotClass