[Checkins] SVN: five.grok/trunk/src/five/grok/ Refactor to reflect
grokcore.view better.
Martin Aspeli
optilude at gmx.net
Sun Aug 3 19:55:32 EDT 2008
Log message for revision 89326:
Refactor to reflect grokcore.view better.
Changed:
U five.grok/trunk/src/five/grok/__init__.py
U five.grok/trunk/src/five/grok/components.py
U five.grok/trunk/src/five/grok/templatereg.py
-=-
Modified: five.grok/trunk/src/five/grok/__init__.py
===================================================================
--- five.grok/trunk/src/five/grok/__init__.py 2008-08-03 22:44:30 UTC (rev 89325)
+++ five.grok/trunk/src/five/grok/__init__.py 2008-08-03 23:55:31 UTC (rev 89326)
@@ -3,3 +3,4 @@
from grokcore.view import *
from five.grok.components import View, Model
+from five.grok.components import ZopeTwoPageTemplate
\ No newline at end of file
Modified: five.grok/trunk/src/five/grok/components.py
===================================================================
--- five.grok/trunk/src/five/grok/components.py 2008-08-03 22:44:30 UTC (rev 89325)
+++ five.grok/trunk/src/five/grok/components.py 2008-08-03 23:55:31 UTC (rev 89326)
@@ -1,9 +1,11 @@
-import martian
-
from zope import interface
from zope.annotation.interfaces import IAttributeAnnotatable
import grokcore.view
+
+from grokcore.view.components import PageTemplate
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
from grokcore.component.interfaces import IContext
import Acquisition
@@ -17,3 +19,17 @@
class View(grokcore.view.View, Acquisition.Explicit):
pass
+
+class ZopeTwoPageTemplate(PageTemplate):
+
+ def setFromString(self, string):
+ raise NotImplemented
+
+ def setFromFilename(self, filename, _prefix=None):
+ self._template = ViewPageTemplateFile(filename, _prefix)
+
+ def render(self, view):
+ namespace = self.getNamespace(view)
+ template = self._template.__of__(view)
+ namespace.update(template.pt_getContext())
+ return template(namespace)
Modified: five.grok/trunk/src/five/grok/templatereg.py
===================================================================
--- five.grok/trunk/src/five/grok/templatereg.py 2008-08-03 22:44:30 UTC (rev 89325)
+++ five.grok/trunk/src/five/grok/templatereg.py 2008-08-03 23:55:31 UTC (rev 89326)
@@ -1,24 +1,8 @@
import grokcore.component
-
-from grokcore.view.components import PageTemplate
from grokcore.view.interfaces import ITemplateFileFactory
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from five.grok.components import ZopeTwoPageTemplate
-class ZopeTwoPageTemplate(PageTemplate):
-
- def setFromString(self, string):
- raise NotImplemented
-
- def setFromFilename(self, filename, _prefix=None):
- self._template = ViewPageTemplateFile(filename, _prefix)
-
- def render(self, view):
- namespace = self.getNamespace(view)
- template = self._template.__of__(view)
- namespace.update(template.pt_getContext())
- return template(namespace)
-
class ZopeTwoPageTemplateFileFactory(grokcore.component.GlobalUtility):
grokcore.component.implements(ITemplateFileFactory)
grokcore.component.name('pt')
More information about the Checkins
mailing list