[Checkins] SVN: z3c.bobopublisher/trunk/ Removed the strict dependency on zope.security.

Fabio Tranchitella kobold at kobold.it
Sun Aug 23 04:29:31 EDT 2009


Log message for revision 103096:
  Removed the strict dependency on zope.security.

Changed:
  U   z3c.bobopublisher/trunk/CHANGES.txt
  U   z3c.bobopublisher/trunk/setup.py
  U   z3c.bobopublisher/trunk/src/z3c/bobopublisher/metaconfigure.py
  U   z3c.bobopublisher/trunk/src/z3c/bobopublisher/metadirectives.py

-=-
Modified: z3c.bobopublisher/trunk/CHANGES.txt
===================================================================
--- z3c.bobopublisher/trunk/CHANGES.txt	2009-08-23 08:21:13 UTC (rev 103095)
+++ z3c.bobopublisher/trunk/CHANGES.txt	2009-08-23 08:29:31 UTC (rev 103096)
@@ -7,6 +7,9 @@
 - Removed dependency on zope.browser, defining a z3c.bobpublisher-specific
   IBrowserPage interface.
 
+- Removed the strict dependency on zope.security, which is now available under
+  the 'security' extra.
+
 0.1.3 (2009-08-22)
 ------------------
 

Modified: z3c.bobopublisher/trunk/setup.py
===================================================================
--- z3c.bobopublisher/trunk/setup.py	2009-08-23 08:21:13 UTC (rev 103095)
+++ z3c.bobopublisher/trunk/setup.py	2009-08-23 08:29:31 UTC (rev 103096)
@@ -17,6 +17,7 @@
     namespace_packages=['z3c'],
     tests_require=[
         'webtest',
+        'zope.security',
         'zope.testing',
     ],
     install_requires=[
@@ -35,8 +36,12 @@
     extras_require=dict(
         test=[
             'webtest',
+            'zope.security',
             'zope.testing',
         ],
+        security=[
+            'zope.security',
+        ]
     ),
     entry_points="""
     [paste.app_factory]

Modified: z3c.bobopublisher/trunk/src/z3c/bobopublisher/metaconfigure.py
===================================================================
--- z3c.bobopublisher/trunk/src/z3c/bobopublisher/metaconfigure.py	2009-08-23 08:21:13 UTC (rev 103095)
+++ z3c.bobopublisher/trunk/src/z3c/bobopublisher/metaconfigure.py	2009-08-23 08:29:31 UTC (rev 103096)
@@ -28,11 +28,19 @@
 from zope.component import getGlobalSiteManager
 from zope.interface import Interface
 from zope.location.interfaces import IRoot
-from zope.security.checker import CheckerPublic
-from zope.security.interfaces import Unauthorized
-from zope.security.management import checkPermission
 
+try:
+    from zope.security.checker import CheckerPublic
+    from zope.security.interfaces import Unauthorized
+    from zope.security.management import checkPermission
+except ImportError:
+    CheckerPublic = None
+    def checkPermission(permission, context):
+        return True
+    class Unauthorized(Exception):
+        pass
 
+
 def _page_factory(class_, name, permission, attribute=None):
     def factory(context, request):
         if permission is not None and \

Modified: z3c.bobopublisher/trunk/src/z3c/bobopublisher/metadirectives.py
===================================================================
--- z3c.bobopublisher/trunk/src/z3c/bobopublisher/metadirectives.py	2009-08-23 08:21:13 UTC (rev 103095)
+++ z3c.bobopublisher/trunk/src/z3c/bobopublisher/metadirectives.py	2009-08-23 08:29:31 UTC (rev 103096)
@@ -21,9 +21,14 @@
 from zope.interface import Interface
 from zope.location.interfaces import IRoot
 from zope.schema import TextLine, BytesLine
-from zope.security.zcml import Permission
 
+try:
+    from zope.security.zcml import Permission
+except ImportError:
+    class Permission(TextLine):
+        pass
 
+
 class IPageDirective(Interface):
     """bobo:page directive"""
 



More information about the Checkins mailing list