[Checkins] SVN: grokcore.view/new/src/grokcore/view/templatereg.py Fix imports

Philipp von Weitershausen philikon at philikon.de
Sat Aug 2 09:20:29 EDT 2008


Log message for revision 89221:
  Fix imports
  

Changed:
  U   grokcore.view/new/src/grokcore/view/templatereg.py

-=-
Modified: grokcore.view/new/src/grokcore/view/templatereg.py
===================================================================
--- grokcore.view/new/src/grokcore/view/templatereg.py	2008-08-02 13:20:10 UTC (rev 89220)
+++ grokcore.view/new/src/grokcore/view/templatereg.py	2008-08-02 13:20:29 UTC (rev 89221)
@@ -1,9 +1,11 @@
-from martian.error import GrokError
-
 import os
+import warnings
 import zope.component
-import grok
-import warnings
+import grokcore.component
+import grokcore.view
+from martian.error import GrokError
+from grokcore.view.interfaces import ITemplateFileFactory
+from grokcore.view.components import PageTemplate
 
 class TemplateRegistry(object):
 
@@ -23,7 +25,7 @@
         return entry['template']
 
     def findFilesystem(self, module_info):
-        template_dir_name = grok.templatedir.bind().get(
+        template_dir_name = grokcore.view.templatedir.bind().get(
             module=module_info.getModule())
         if template_dir_name is None:
             template_dir_name = module_info.name + '_templates'
@@ -43,7 +45,7 @@
             template_name, extension = os.path.splitext(template_file)
             extension = extension[1:] # Get rid of the leading dot.
             template_factory = zope.component.queryUtility(
-                grok.interfaces.ITemplateFileFactory,
+                grokcore.view.interfaces.ITemplateFileFactory,
                 name=extension)
 
             if template_factory is None:
@@ -88,7 +90,7 @@
     def checkTemplates(self, module_info, factory, component_name,
                        has_render, has_no_render):
         factory_name = factory.__name__.lower()
-        template_name = grok.template.bind().get(factory)
+        template_name = grokcore.view.template.bind().get(factory)
         if template_name is None:
             template_name = factory_name
 
@@ -121,10 +123,9 @@
                                 "'render' method." %
                                 (component_name.title(), factory), factory)
 
-class PageTemplateFileFactory(grok.GlobalUtility):
+class PageTemplateFileFactory(grokcore.component.GlobalUtility):
+    grokcore.component.implements(ITemplateFileFactory)
+    grokcore.component.name('pt')
 
-    grok.implements(grok.interfaces.ITemplateFileFactory)
-    grok.name('pt')
-
     def __call__(self, filename, _prefix=None):
-        return grok.components.PageTemplate(filename=filename, _prefix=_prefix)
+        return PageTemplate(filename=filename, _prefix=_prefix)



More information about the Checkins mailing list