[z3-checkins] r8272 - z3/Five/trunk

[regebro at codespeak.net]

Author: regebro
Date: Fri Jan 14 16:30:45 2005
New Revision: 8272

Modified:
   z3/Five/trunk/globalbrowsermenuservice.py
Log:
Now uses the new checkPermission method.

Modified: z3/Five/trunk/globalbrowsermenuservice.py
==============================================================================
--- z3/Five/trunk/globalbrowsermenuservice.py	(original)
+++ z3/Five/trunk/globalbrowsermenuservice.py	Fri Jan 14 16:30:45 2005
@@ -20,7 +20,7 @@
 from zope.security.interfaces import Unauthorized, Forbidden
 from zope.interface import implements, implementedBy
 from zope.security.checker import CheckerPublic
-from zope.security import checkPermission
+from security import checkPermission
 from zope.app.component.metaconfigure import handler
 from zope.app.publisher.interfaces.browser import IBrowserMenuService
 from zope.app.publisher.interfaces.browser import IGlobalBrowserMenuService
@@ -33,8 +33,6 @@
 from zope.app.component.interface import provideInterface
 from zope.app.servicenames import BrowserMenu
 
-from AccessControl import getSecurityManager
-
 # TODO: This was copied and trimmed down from zope.interface.
 # Eventually, this will be eliminated when the browser menu
 # service is changed to use adapters.
@@ -89,11 +87,11 @@
 
             permission = item.permission
             action = item.action
-            
+
             if permission:
                 # If we have an explicit permission, check that we
-                # can access it. #diff
-                if not getSecurityManager().checkPermission(permission, object):
+                # can access it.
+                if not checkPermission(permission, object):
                     continue
 
             elif action:
@@ -232,7 +230,7 @@
             args = (self.interface.__module__+'.'+self.interface.getName(),
                     self.interface)
             )
-        
+
 
 globalBrowserMenuService = GlobalBrowserMenuService()