[Checkins] SVN: grok/branches/grokcore.xxx/ Use grokcore.security

[Philipp von Weitershausen]

Log message for revision 88932:
  Use grokcore.security
  

Changed:
  U   grok/branches/grokcore.xxx/buildout.cfg
  _U  grok/branches/grokcore.xxx/devel/
  U   grok/branches/grokcore.xxx/src/grok/__init__.py
  U   grok/branches/grokcore.xxx/src/grok/interfaces.py
  U   grok/branches/grokcore.xxx/src/grok/meta.py
  U   grok/branches/grokcore.xxx/src/grok/meta.zcml
  U   grok/branches/grokcore.xxx/src/grok/testing.py
  U   grok/branches/grokcore.xxx/src/grok/util.py

-=-
Modified: grok/branches/grokcore.xxx/buildout.cfg
===================================================================
--- grok/branches/grokcore.xxx/buildout.cfg	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/buildout.cfg	2008-07-28 22:38:12 UTC (rev 88932)
@@ -1,5 +1,5 @@
 [buildout]
-develop = . grokdocs grokwiki devel/grokcore.view
+develop = . grokdocs grokwiki devel/grokcore.view devel/grokcore.security
 parts = docs interpreter grokwiki zopectl data test bundlemaker omelette
 find-links = http://download.zope.org/distribution/
 extends = versions.cfg


Property changes on: grok/branches/grokcore.xxx/devel
___________________________________________________________________
Name: svn:externals
   - grokcore.view svn://svn.zope.org/repos/main/grokcore.view/trunk

   + grokcore.security svn://svn.zope.org/repos/main/grokcore.security/trunk
grokcore.view     svn://svn.zope.org/repos/main/grokcore.view/trunk


Modified: grok/branches/grokcore.xxx/src/grok/__init__.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/__init__.py	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/src/grok/__init__.py	2008-07-28 22:38:12 UTC (rev 88932)
@@ -14,8 +14,11 @@
 """Grok
 """
 
-from zope.interface import implements
-from zope.component import adapts
+from grokcore.component import *
+from grokcore.security import *
+from grokcore.view import *
+from grokcore.view.formlib import action, AutoFields, Fields
+
 from zope.event import notify
 from zope.app.component.hooks import getSite
 from zope.lifecycleevent import (
@@ -42,26 +45,14 @@
 from grok.components import RESTProtocol, IRESTLayer
 from grok.interfaces import IRESTSkinType
 from grok.components import ViewletManager, Viewlet
-from grokcore.view import Permission, Public, Skin, IGrokLayer
-from grokcore.view import PageTemplate, PageTemplateFile
-
-from martian import baseclass
-from grokcore.component.directive import (
-    context, name, title, description, provides, global_utility, direct)
 from grok.directive import (
     local_utility, permissions, site,
     traversable, order, viewletmanager)
-from grokcore.component.decorators import subscribe, adapter, implementer
-from martian.error import GrokError, GrokImportError
 
-from grokcore.view import layer, view, require, template, templatedir
-
 # BBB These two functions are meant for test fixtures and should be
 # imported from grok.testing, not from grok.
 from grok.testing import grok, grok_component
 
-from grokcore.view.formlib import action, AutoFields, Fields
-from grokcore.view import url
 
 # Our __init__ provides the grok API directly so using 'import grok' is enough.
 from grok.interfaces import IGrokAPI

Modified: grok/branches/grokcore.xxx/src/grok/interfaces.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/interfaces.py	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/src/grok/interfaces.py	2008-07-28 22:38:12 UTC (rev 88932)
@@ -42,7 +42,6 @@
     Annotation = interface.Attribute("Base class for persistent annotations.")
     GlobalUtility = interface.Attribute("Base class for global utilities.")
     LocalUtility = interface.Attribute("Base class for local utilities.")
-    View = interface.Attribute("Base class for browser views.")
     XMLRPC = interface.Attribute("Base class for XML-RPC methods.")
     JSON = interface.Attribute("Base class for JSON methods.")
     REST = interface.Attribute("Base class for REST views.")

Modified: grok/branches/grokcore.xxx/src/grok/meta.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/meta.py	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/src/grok/meta.py	2008-07-28 22:38:12 UTC (rev 88932)
@@ -51,7 +51,7 @@
 
 from grokcore.component.scan import determine_module_component
 
-from grokcore.view.meta import PermissionGrokker
+from grokcore.security.meta import PermissionGrokker
 from grokcore.view.util import default_view_name
 from grokcore.view.util import default_fallback_to_name
 

Modified: grok/branches/grokcore.xxx/src/grok/meta.zcml
===================================================================
--- grok/branches/grokcore.xxx/src/grok/meta.zcml	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/src/grok/meta.zcml	2008-07-28 22:38:12 UTC (rev 88932)
@@ -7,6 +7,7 @@
 
   <!-- Load the grokkers -->
   <include package="grokcore.component" file="meta.zcml" />
+  <include package="grokcore.security" file="meta.zcml" />
   <include package="grokcore.view" file="meta.zcml" />
   <grok:grok package=".meta" />
 

Modified: grok/branches/grokcore.xxx/src/grok/testing.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/testing.py	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/src/grok/testing.py	2008-07-28 22:38:12 UTC (rev 88932)
@@ -42,6 +42,7 @@
 def grok(module_name):
     config = ConfigurationMachine()
     zcml.do_grok('grokcore.component.meta', config)
+    zcml.do_grok('grokcore.security.meta', config)
     zcml.do_grok('grokcore.view.meta', config)
     zcml.do_grok('grok.meta', config)
     zcml.do_grok('grokcore.view.templatereg', config)

Modified: grok/branches/grokcore.xxx/src/grok/util.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/util.py	2008-07-28 22:36:00 UTC (rev 88931)
+++ grok/branches/grokcore.xxx/src/grok/util.py	2008-07-28 22:38:12 UTC (rev 88932)
@@ -17,7 +17,7 @@
 import zope.location.location
 from zope import interface
 # XXX BBB
-from grokcore.view.util import check_permission
+from grokcore.security.util import check_permission
 from zope.security.checker import NamesChecker, defineChecker
 
 def make_checker(factory, view_factory, permission, method_names=None):