[Checkins] SVN: grok/branches/jw-define-roles-directive/src/grok/
Rewrite security related tests to use grok.Permission instead of the
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Mon Aug 20 10:51:12 EDT 2007
Log message for revision 79031:
Rewrite security related tests to use grok.Permission instead of the
remove grok.define_permission directive.
Changed:
U grok/branches/jw-define-roles-directive/src/grok/ftests/security/grant.py
U grok/branches/jw-define-roles-directive/src/grok/ftests/security/require.py
U grok/branches/jw-define-roles-directive/src/grok/ftests/security/roles.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json2.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc2.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc3.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_role_name.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_json.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_xmlrpc.py
U grok/branches/jw-define-roles-directive/src/grok/tests/security/view_decorator.py
-=-
Modified: grok/branches/jw-define-roles-directive/src/grok/ftests/security/grant.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/ftests/security/grant.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/ftests/security/grant.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,6 +1,6 @@
# -*- coding: latin-1 -*-
"""
-We can define a few permissions with grok.define_permission:
+We can define a few permissions with grok.Permission:
>>> import grok
>>> grok.grok('grok.ftests.security.grant')
@@ -22,10 +22,10 @@
"""
import grok
-grok.define_permission('grok.ascii-permission')
+class ASCIIPermission(grok.Permission):
+ grok.name('grok.ascii-permission')
+
# TODO Technically, it's absolutely possible to give permissions
# non-ASCII names. However the way Zope 3's grant view uses widgets to
# display form controls for each permission is not unicode-safe.
-
-#grok.define_permission(u'grok.ünicöde-permission')
Modified: grok/branches/jw-define-roles-directive/src/grok/ftests/security/require.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/ftests/security/require.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/ftests/security/require.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -33,7 +33,8 @@
import grok
import zope.interface
-grok.define_permission('grok.ViewPainting')
+class ViewPainting(grok.Permission):
+ grok.name('grok.ViewPainting')
class CavePainting(grok.View):
Modified: grok/branches/jw-define-roles-directive/src/grok/ftests/security/roles.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/ftests/security/roles.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/ftests/security/roles.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -43,11 +43,18 @@
import grok
import zope.interface
-grok.define_permission('grok.ViewPainting')
-grok.define_permission('grok.EditPainting')
-grok.define_permission('grok.ErasePainting')
-grok.define_permission('grok.ApprovePainting')
+class View(grok.Permission):
+ grok.name('grok.ViewPainting')
+class Edit(grok.Permission):
+ grok.name('grok.EditPainting')
+
+class Erase(grok.Permission):
+ grok.name('grok.ErasePainting')
+
+class Approve(grok.Permission):
+ grok.name('grok.ApprovePainting')
+
class PaintingOwner(grok.Role):
grok.name('grok.PaintingOwner')
grok.title('Painting Owner')
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,10 +1,12 @@
"""
-A permission has to be defined first (using grok.define_permission for
-example) before it can be used in grok.require().
+A permission has to be defined first (using grok.Permission for example)
+before it can be used in grok.require().
>>> grok.grok(__name__)
Traceback (most recent call last):
- GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission.MissingPermission'>. Use grok.define_permission first.
+ GrokError: Undefined permission 'doesnt.exist' in <class
+ 'grok.tests.security.missing_permission.MissingPermission'>. Use
+ grok.Permission first.
"""
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,10 +1,12 @@
"""
-A permission has to be defined first (using grok.define_permission for
-example) before it can be used in grok.require() in an JSON class.
+A permission has to be defined first (using grok.Permission for example)
+before it can be used in grok.require() in an JSON class.
>>> grok.grok(__name__)
Traceback (most recent call last):
- GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_json.MissingPermission'>. Use grok.define_permission first.
+ GrokError: Undefined permission 'doesnt.exist' in <class
+ 'grok.tests.security.missing_permission_json.MissingPermission'>. Use
+ grok.Permission first.
"""
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json2.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json2.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_json2.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,10 +1,12 @@
"""
-A permission has to be defined first (using grok.define_permission for
-example) before it can be used in @grok.require().
+A permission has to be defined first (using grok.Permission for example)
+before it can be used in @grok.require().
>>> grok.grok(__name__)
Traceback (most recent call last):
- GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_json2.MissingPermission'>. Use grok.define_permission first.
+ GrokError: Undefined permission 'doesnt.exist' in <class
+ 'grok.tests.security.missing_permission_json2.MissingPermission'>. Use
+ grok.Permission first.
"""
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,10 +1,12 @@
"""
-A permission has to be defined first (using grok.define_permission for
-example) before it can be used in grok.require() in an XMLRPC class.
+A permission has to be defined first (using grok.Permission for example)
+before it can be used in grok.require() in an XMLRPC class.
>>> grok.grok(__name__)
Traceback (most recent call last):
- GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc.MissingPermission'>. Use grok.define_permission first.
+ GrokError: Undefined permission 'doesnt.exist' in <class
+ 'grok.tests.security.missing_permission_xmlrpc.MissingPermission'>. Use
+ grok.Permission first.
"""
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc2.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc2.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc2.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,10 +1,12 @@
"""
-A permission has to be defined first (using grok.define_permission for
-example) before it can be used in @grok.require().
+A permission has to be defined first (using grok.Permission for example)
+before it can be used in @grok.require().
>>> grok.grok(__name__)
Traceback (most recent call last):
- GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc2.MissingPermission'>. Use grok.define_permission first.
+ GrokError: Undefined permission 'doesnt.exist' in <class
+ 'grok.tests.security.missing_permission_xmlrpc2.MissingPermission'>. Use
+ grok.Permission first.
"""
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc3.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc3.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_permission_xmlrpc3.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -1,19 +1,22 @@
"""
-A permission has to be defined first (using grok.define_permission for
-example) before it can be used in grok.require() in an XMLRPC class. This
-is even the case for a default permission that is never used.
+A permission has to be defined first (using grok.Permission for example)
+before it can be used in grok.require() in an XMLRPC class. This is even the
+case for a default permission that is never used.
>>> grok.grok(__name__)
Traceback (most recent call last):
...
- GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc3.MissingPermission'>. Use grok.define_permission first.
+ GrokError: Undefined permission 'doesnt.exist' in <class
+ 'grok.tests.security.missing_permission_xmlrpc3.MissingPermission'>. Use
+ grok.Permission first.
"""
import grok
import zope.interface
-grok.define_permission('foo')
+class Foo(grok.Permission):
+ grok.name('foo')
class MissingPermission(grok.XMLRPC):
grok.context(zope.interface.Interface)
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_role_name.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_role_name.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/missing_role_name.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -4,7 +4,7 @@
>>> grok.grok(__name__)
Traceback (most recent call last):
GrokError: A role needs to have a dotted name for its id.
- Use grok.name to specifiy one.
+ Use grok.name to specify one.
"""
import grok
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -10,9 +10,12 @@
import grok
import zope.interface
-grok.define_permission('permission.1')
-grok.define_permission('permission.2')
+class One(grok.Permission):
+ grok.name('permission.1')
+class Two(grok.Permission):
+ grok.name('permission.2')
+
class MultipleView(grok.View):
grok.context(zope.interface.Interface)
grok.require('permission.1')
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_json.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_json.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_json.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -5,14 +5,17 @@
Traceback (most recent call last):
...
GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_json.MultipleJSON'>. It may only be set once for a class.
-
+
"""
import grok
import zope.interface
-grok.define_permission('permission.1')
-grok.define_permission('permission.2')
+class One(grok.Permission):
+ grok.name('permission.1')
+class Two(grok.Permission):
+ grok.name('permission.2')
+
class MultipleJSON(grok.JSON):
grok.context(zope.interface.Interface)
grok.require('permission.1')
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_xmlrpc.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_xmlrpc.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/multiple_require_xmlrpc.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -9,9 +9,12 @@
import grok
import zope.interface
-grok.define_permission('permission.1')
-grok.define_permission('permission.2')
+class One(grok.Permission):
+ grok.name('permission.1')
+class Two(grok.Permission):
+ grok.name('permission.2')
+
class MultipleXMLRPC(grok.XMLRPC):
grok.context(zope.interface.Interface)
grok.require('permission.1')
Modified: grok/branches/jw-define-roles-directive/src/grok/tests/security/view_decorator.py
===================================================================
--- grok/branches/jw-define-roles-directive/src/grok/tests/security/view_decorator.py 2007-08-20 14:49:52 UTC (rev 79030)
+++ grok/branches/jw-define-roles-directive/src/grok/tests/security/view_decorator.py 2007-08-20 14:51:12 UTC (rev 79031)
@@ -11,7 +11,8 @@
import grok
import zope.interface
-grok.define_permission('bogus.perm')
+class Bogus(grok.Permission):
+ grok.name('bogus.perm')
class BogusView(grok.View):
grok.context(zope.interface.Interface)
More information about the Checkins
mailing list