[Checkins] SVN: five.grok/branches/regebro-grokcore.view/src/five/grok/ Cleanup

Lennart Regebro regebro at gmail.com
Fri Jul 18 10:12:15 EDT 2008


Log message for revision 88512:
  Cleanup

Changed:
  U   five.grok/branches/regebro-grokcore.view/src/five/grok/components.py
  U   five.grok/branches/regebro-grokcore.view/src/five/grok/configure.zcml
  U   five.grok/branches/regebro-grokcore.view/src/five/grok/ftesting.zcml
  U   five.grok/branches/regebro-grokcore.view/src/five/grok/meta.py

-=-
Modified: five.grok/branches/regebro-grokcore.view/src/five/grok/components.py
===================================================================
--- five.grok/branches/regebro-grokcore.view/src/five/grok/components.py	2008-07-18 14:09:03 UTC (rev 88511)
+++ five.grok/branches/regebro-grokcore.view/src/five/grok/components.py	2008-07-18 14:12:14 UTC (rev 88512)
@@ -1,24 +1,12 @@
-import sys, os
-import warnings
-
-import martian
 from zope import interface
-from zope import component
 from zope.annotation.interfaces import IAttributeAnnotatable
-from zope.app.pagetemplate.engine import TrustedAppPT
-from zope.pagetemplate import pagetemplate, pagetemplatefile
 
 from grokcore.component.interfaces import IContext
 from grokcore.view.components import ViewMixin
 
-from zope.publisher.publish import mapply
-
 import Acquisition
 from OFS.SimpleItem import SimpleItem
 
-from zope.app.container.contained import Contained
-import persistent
-
 from zope.publisher.browser import BrowserPage
 
 class Model(SimpleItem):
@@ -28,4 +16,4 @@
     interface.implements(IAttributeAnnotatable, IContext)
 
 class View(ViewMixin, BrowserPage, Acquisition.Implicit):
-    pass
+    pass
\ No newline at end of file

Modified: five.grok/branches/regebro-grokcore.view/src/five/grok/configure.zcml
===================================================================
--- five.grok/branches/regebro-grokcore.view/src/five/grok/configure.zcml	2008-07-18 14:09:03 UTC (rev 88511)
+++ five.grok/branches/regebro-grokcore.view/src/five/grok/configure.zcml	2008-07-18 14:12:14 UTC (rev 88512)
@@ -17,7 +17,5 @@
     />
 
   <include package="grokcore.view" file="meta.zcml" />
-  <include package="zope.app.basicskin" />
-  <include package="zope.app.rotterdam" />
   
 </configure>

Modified: five.grok/branches/regebro-grokcore.view/src/five/grok/ftesting.zcml
===================================================================
--- five.grok/branches/regebro-grokcore.view/src/five/grok/ftesting.zcml	2008-07-18 14:09:03 UTC (rev 88511)
+++ five.grok/branches/regebro-grokcore.view/src/five/grok/ftesting.zcml	2008-07-18 14:12:14 UTC (rev 88512)
@@ -9,4 +9,8 @@
 
   <!-- And also grok all the ftests /-->
   <grok:grok package="five.grok.ftests" />
+  
+  <include package="zope.app.basicskin" />
+  <include package="zope.app.rotterdam" />
+
 </configure>

Modified: five.grok/branches/regebro-grokcore.view/src/five/grok/meta.py
===================================================================
--- five.grok/branches/regebro-grokcore.view/src/five/grok/meta.py	2008-07-18 14:09:03 UTC (rev 88511)
+++ five.grok/branches/regebro-grokcore.view/src/five/grok/meta.py	2008-07-18 14:12:14 UTC (rev 88512)
@@ -1,16 +1,9 @@
 import martian
-from martian import util
-from martian.error import GrokError
-from zope import interface, component
-from zope.publisher.interfaces.browser import (IDefaultBrowserLayer,
-                                               IBrowserRequest,
-                                               IBrowserSkinType)
 from five import grok
 
 from Products.Five.security import protectClass
 from Globals import InitializeClass as initializeClass
 
-from grokcore.view import templatereg
 from grokcore.view.meta import ViewGrokkerBase
 
 def default_view_name(factory, module=None, **data):
@@ -25,17 +18,6 @@
             
         return super(ViewGrokker, self).execute(factory, config, context, layer, name, permission, **kw)
             
-    def checkTemplates(self, templates, module_info, factory):
-        def has_render(factory):
-            # XXX We haven't implemented GrokForm yet
-            return (getattr(factory, 'render', None))
-                    #and
-                    #not util.check_subclass(factory, grok.components.GrokForm))
-        def has_no_render(factory):
-            return not getattr(factory, 'render', None)
-        templates.checkTemplates(module_info, factory, 'view',
-                                 has_render, has_no_render)
-
     def protectName(self, config, factory, permission):
         config.action(
             discriminator = ('five:protectClass', factory),



More information about the Checkins mailing list