[Checkins] SVN: grok/branches/grokcore.xxx/ move Skin, SkinGrokker, and IGrokLayer to grokcore.view

[Godefroid Chapelle]

Log message for revision 88505:
  move Skin, SkinGrokker, and IGrokLayer to grokcore.view

Changed:
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/meta.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt
  U   grok/branches/grokcore.xxx/src/grok/__init__.py
  U   grok/branches/grokcore.xxx/src/grok/components.py
  U   grok/branches/grokcore.xxx/src/grok/meta.py

-=-
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py	2008-07-18 13:42:20 UTC (rev 88505)
@@ -1,4 +1,5 @@
 from directive import layer, view, require, template, templatedir
 from util import url
-from components import ViewMixin, Permission, GrokForm
+from components import ViewMixin, Permission, GrokForm, Skin
 from components import PageTemplate, PageTemplateFile
+from components import IGrokLayer

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py	2008-07-18 13:42:20 UTC (rev 88505)
@@ -20,6 +20,14 @@
     pass
 
 
+class Skin(object):
+    pass
+
+
+class IGrokLayer(interface.Interface):
+    pass
+
+
 #XXX rename to GrokView
 class ViewMixin(object):
 

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/meta.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/meta.py	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/meta.py	2008-07-18 13:42:20 UTC (rev 88505)
@@ -1,7 +1,8 @@
 import os
 
 from zope import component, interface
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import (IDefaultBrowserLayer,
+    IBrowserRequest, IBrowserSkinType)
 from zope.security.interfaces import IPermission
 
 import martian
@@ -17,6 +18,19 @@
 from grokcore.view.util import default_fallback_to_name
 
 
+class SkinGrokker(martian.ClassGrokker):
+    martian.component(grokcore.view.Skin)
+    martian.directive(grokcore.view.layer, default=IBrowserRequest)
+    martian.directive(grokcore.component.name, get_default=default_view_name)
+
+    def execute(self, factory, config, name, layer, **kw):
+        config.action(
+            discriminator=('skin', name),
+            callable=component.interface.provideInterface,
+            args=(name, layer, IBrowserSkinType))
+        return True
+
+
 class ViewGrokkerBase(martian.ClassGrokker):
     martian.directive(grokcore.component.context)
     martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt	2008-07-18 13:42:20 UTC (rev 88505)
@@ -1 +1,2 @@
 * move namemultiple, nameunicode, nomodulename from tests/view to grokcore.component
+* factor out formlib support

Modified: grok/branches/grokcore.xxx/src/grok/__init__.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/__init__.py	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/src/grok/__init__.py	2008-07-18 13:42:20 UTC (rev 88505)
@@ -39,11 +39,10 @@
 from grok.components import Application, Form, AddForm, EditForm, DisplayForm
 from grok.components import Indexes
 from grok.components import Role, Public
-from grok.components import Skin, IGrokLayer
 from grok.components import RESTProtocol, IRESTLayer
 from grok.interfaces import IRESTSkinType
 from grok.components import ViewletManager, Viewlet
-from grokcore.view import Permission
+from grokcore.view import Permission, Skin, IGrokLayer
 from grokcore.view import PageTemplate, PageTemplateFile
 
 from martian import baseclass

Modified: grok/branches/grokcore.xxx/src/grok/components.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/components.py	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/src/grok/components.py	2008-07-18 13:42:20 UTC (rev 88505)
@@ -402,15 +402,9 @@
 class Role(Role):
     pass
 
-class IGrokLayer(interface.Interface):
-    pass
-
 class IRESTLayer(interface.Interface):
     pass
 
-class Skin(object):
-    pass
-
 class RESTProtocol(object):
     pass
 

Modified: grok/branches/grokcore.xxx/src/grok/meta.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/meta.py	2008-07-18 13:32:47 UTC (rev 88504)
+++ grok/branches/grokcore.xxx/src/grok/meta.py	2008-07-18 13:42:20 UTC (rev 88505)
@@ -17,8 +17,7 @@
 from zope import interface, component
 from zope.publisher.interfaces.browser import (IDefaultBrowserLayer,
                                                IBrowserRequest,
-                                               IBrowserPublisher,
-                                               IBrowserSkinType)
+                                               IBrowserPublisher)
 from zope.publisher.interfaces.http import IHTTPRequest
 
 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
@@ -66,6 +65,7 @@
     util.check_implements_one_from_list(real_interfaces, factory)
     return real_interfaces[0]
 
+
 def default_annotation_name(factory, module, **data):
     return factory.__module__ + '.' + factory.__name__
 
@@ -442,19 +442,6 @@
         return intids
 
 
-class SkinGrokker(martian.ClassGrokker):
-    martian.component(grok.Skin)
-    martian.directive(grok.layer, default=IBrowserRequest)
-    martian.directive(grok.name, get_default=default_view_name)
-
-    def execute(self, factory, config, name, layer, **kw):
-        config.action(
-            discriminator=('skin', name),
-            callable=zope.component.interface.provideInterface,
-            args=(name, layer, IBrowserSkinType)
-            )
-        return True
-
 class RESTProtocolGrokker(martian.ClassGrokker):
     martian.component(grok.RESTProtocol)
     martian.directive(grok.layer, default=IBrowserRequest)