[Checkins] SVN: z3ext.preferences/t

[Nikolay Kim]

Log message for revision 94669:
  

Changed:
  U   z3ext.preferences/tags/1.4.5/src/z3ext/preferences/zcml.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/zcml.py

-=-
Modified: z3ext.preferences/tags/1.4.5/src/z3ext/preferences/zcml.py
===================================================================
--- z3ext.preferences/tags/1.4.5/src/z3ext/preferences/zcml.py	2009-01-09 02:50:22 UTC (rev 94668)
+++ z3ext.preferences/tags/1.4.5/src/z3ext/preferences/zcml.py	2009-01-09 05:27:41 UTC (rev 94669)
@@ -119,19 +119,25 @@
 
     def __init__(self, _context, id, schema, title,
                  for_=None, description=u'', class_=None, provides=[],
-                 permission='z3ext.ModifyPreference', 
-                 accesspermission='z3ext.ModifyPreference', tests=(), order = 9999):
+                 permission='z3ext.ModifyPreference', accesspermission='',
+                 tests=(), order = 9999):
 
         if not accesspermission:
             accesspermission = permission
 
+        if permission == 'zope.Public':
+            permission = CheckerPublic
+
+        if accesspermission == 'zope.Public':
+            accesspermission = CheckerPublic 
+
         Class = PreferenceType(str(id), schema, class_, title, description)
         Class.order = order
         Class.__permission__ = permission
         Class.__accesspermission__ = accesspermission
 
         tests = tuple(tests)
-        if permission != 'zope.Public':
+        if permission != CheckerPublic:
             tests = tests + (PermissionChecker,)
         if interface.interfaces.IInterface.providedBy(for_):
             tests = tests + (PrincipalChecker(for_),)
@@ -172,8 +178,6 @@
                 set_attributes=None, set_schema=None):
         """Require a permission to access a specific aspect"""
         if not (interface or attributes or set_attributes or set_schema):
-            if like_class:
-                return
             raise ConfigurationError("Nothing required")
 
         if not permission:

Modified: z3ext.preferences/trunk/src/z3ext/preferences/zcml.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/zcml.py	2009-01-09 02:50:22 UTC (rev 94668)
+++ z3ext.preferences/trunk/src/z3ext/preferences/zcml.py	2009-01-09 05:27:41 UTC (rev 94669)
@@ -119,19 +119,25 @@
 
     def __init__(self, _context, id, schema, title,
                  for_=None, description=u'', class_=None, provides=[],
-                 permission='z3ext.ModifyPreference', 
-                 accesspermission='z3ext.ModifyPreference', tests=(), order = 9999):
+                 permission='z3ext.ModifyPreference', accesspermission='',
+                 tests=(), order = 9999):
 
         if not accesspermission:
             accesspermission = permission
 
+        if permission == 'zope.Public':
+            permission = CheckerPublic
+
+        if accesspermission == 'zope.Public':
+            accesspermission = CheckerPublic 
+
         Class = PreferenceType(str(id), schema, class_, title, description)
         Class.order = order
         Class.__permission__ = permission
         Class.__accesspermission__ = accesspermission
 
         tests = tuple(tests)
-        if permission != 'zope.Public':
+        if permission != CheckerPublic:
             tests = tests + (PermissionChecker,)
         if interface.interfaces.IInterface.providedBy(for_):
             tests = tests + (PrincipalChecker(for_),)
@@ -172,8 +178,6 @@
                 set_attributes=None, set_schema=None):
         """Require a permission to access a specific aspect"""
         if not (interface or attributes or set_attributes or set_schema):
-            if like_class:
-                return
             raise ConfigurationError("Nothing required")
 
         if not permission: