[Checkins] SVN: grokcore.permission/trunk/ move permissions() directive to grokcore.security where it belongs

[Jan Wijbrand Kolman]

Log message for revision 125438:
  move permissions() directive to grokcore.security where it belongs

Changed:
  U   grokcore.permission/trunk/CHANGES.txt
  U   grokcore.permission/trunk/setup.py
  U   grokcore.permission/trunk/src/grokcore/permission/__init__.py
  U   grokcore.permission/trunk/src/grokcore/permission/directive.py
  U   grokcore.permission/trunk/src/grokcore/permission/ftests/permission/roles.py
  U   grokcore.permission/trunk/src/grokcore/permission/meta.py
  U   grokcore.permission/trunk/src/grokcore/permission/tests/permission/permissions.py

-=-
Modified: grokcore.permission/trunk/CHANGES.txt
===================================================================
--- grokcore.permission/trunk/CHANGES.txt	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/CHANGES.txt	2012-04-30 13:06:29 UTC (rev 125438)
@@ -5,9 +5,8 @@
 1.2 (unreleased)
 ================
 
-- Nothing changed yet.
+- Move permissions directive to grokcore.security where it belongs.
 
-
 1.1 (2011-01-20)
 ================
 

Modified: grokcore.permission/trunk/setup.py
===================================================================
--- grokcore.permission/trunk/setup.py	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/setup.py	2012-04-30 13:06:29 UTC (rev 125438)
@@ -44,10 +44,11 @@
     zip_safe=False,
     install_requires=[
         'setuptools',
+        'martian',
         'grokcore.component',
         'grokcore.security',
         'zope.securitypolicy',
-        'martian',
+
         'zope.component',
         'zope.interface',
         'zope.publisher',

Modified: grokcore.permission/trunk/src/grokcore/permission/__init__.py
===================================================================
--- grokcore.permission/trunk/src/grokcore/permission/__init__.py	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/src/grokcore/permission/__init__.py	2012-04-30 13:06:29 UTC (rev 125438)
@@ -13,4 +13,3 @@
 ##############################################################################
 
 from grokcore.permission.components import Role
-from grokcore.permission.directive import permissions
\ No newline at end of file

Modified: grokcore.permission/trunk/src/grokcore/permission/directive.py
===================================================================
--- grokcore.permission/trunk/src/grokcore/permission/directive.py	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/src/grokcore/permission/directive.py	2012-04-30 13:06:29 UTC (rev 125438)
@@ -20,41 +20,3 @@
 from martian.error import GrokImportError
 from grokcore.security import Permission
 
-
-class permissions(martian.Directive):
-    """The `grokcore.permission.permissions()` directive.
-
-    This directive is used inside of a `grok.Role` subclass to list the
-    permissions which each member of the role should always possess.
-    Note that permissions should be passed as strings, and that several
-    permissions they can simply be supplied as multiple arguments; there
-    is no need to place them inside of a tuple or list::
-
-        class MyRole(grokcore.permission.Role):
-            grokcore.permission.permissions('page.CreatePage', 'page.EditPage')
-            ...
-
-    """
-    scope = martian.CLASS
-    store = martian.ONCE
-    default = []
-
-    def validate(self, *values):
-        for value in values:
-            if martian.util.check_subclass(value, Permission):
-                continue
-            if martian.util.not_unicode_or_ascii(value):
-                raise GrokImportError(
-                    "You can only pass unicode values, ASCII values, or "
-                    "subclasses of grokcore.security.Permission to the '%s'"
-                    " directive."
-                    % self.name)
-
-    def factory(self, *values):
-        permission_ids = []
-        for value in values:
-            if martian.util.check_subclass(value, Permission):
-                permission_ids.append(grokcore.component.name.bind().get(value))
-            else:
-                permission_ids.append(value)
-        return permission_ids

Modified: grokcore.permission/trunk/src/grokcore/permission/ftests/permission/roles.py
===================================================================
--- grokcore.permission/trunk/src/grokcore/permission/ftests/permission/roles.py	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/src/grokcore/permission/ftests/permission/roles.py	2012-04-30 13:06:29 UTC (rev 125438)
@@ -64,7 +64,7 @@
 class PaintingOwner(grokcore.permission.Role):
     grok.name('paint.PaintingOwner')
     grok.title('Painting Owner')
-    grokcore.permission.permissions(
+    grokcore.security.permissions(
         'paint.ViewPainting', 'paint.EditPainting', 'paint.ErasePainting')
 
 class CavePainting(grokcore.view.View):

Modified: grokcore.permission/trunk/src/grokcore/permission/meta.py
===================================================================
--- grokcore.permission/trunk/src/grokcore/permission/meta.py	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/src/grokcore/permission/meta.py	2012-04-30 13:06:29 UTC (rev 125438)
@@ -33,7 +33,7 @@
 from grokcore.security.meta import PermissionGrokker
 from zope.securitypolicy.rolepermission import rolePermissionManager
 from grokcore.permission.components import Role
-from grokcore.permission.directive import permissions
+from grokcore.security.directive import permissions
 from zope.securitypolicy.interfaces import IRole
 
 

Modified: grokcore.permission/trunk/src/grokcore/permission/tests/permission/permissions.py
===================================================================
--- grokcore.permission/trunk/src/grokcore/permission/tests/permission/permissions.py	2012-04-30 12:19:34 UTC (rev 125437)
+++ grokcore.permission/trunk/src/grokcore/permission/tests/permission/permissions.py	2012-04-30 13:06:29 UTC (rev 125438)
@@ -10,8 +10,8 @@
 
 import grokcore.component as grok
 import grokcore.permission.testing
-from grokcore.permission import permissions, Role
-from grokcore.security import Permission
+from grokcore.permission import Role
+from grokcore.security import Permission, permissions
 import zope.interface
 
 class FirstPermission(Permission):