[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/ Merged changes from trunk revision 26696

[Dmitry Vasiliev]

Log message for revision 26699:
  Merged changes from trunk revision 26696
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/metaconfigure.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/protectclass.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalpermission.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/rolepermission.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py	2004-07-23 09:39:13 UTC (rev 26698)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py	2004-07-23 09:40:18 UTC (rev 26699)
@@ -18,10 +18,7 @@
 import os
 
 from zope.component.exceptions import ComponentLookupError
-from zope.configuration.exceptions import ConfigurationError
-from zope.exceptions import NotFoundError
 from zope.interface import implements, classImplements, Interface
-from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.exceptions import NotFoundError
 from zope.security.checker import CheckerPublic, Checker
 from zope.security.checker import defineChecker
@@ -29,15 +26,13 @@
 from zope.app.component.interface import provideInterface
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.app.publisher.browser import BrowserView
 from zope.app import zapi
 from zope.app.component.metaconfigure import handler
 from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.publisher.browser import BrowserView
 from zope.app.publisher.browser.globalbrowsermenuservice import \
-     menuItemDirective, globalBrowserMenuService
-from zope.app.security.permission import checkPermission
+     menuItemDirective
 
 
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/metaconfigure.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/metaconfigure.py	2004-07-23 09:39:13 UTC (rev 26698)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/metaconfigure.py	2004-07-23 09:40:18 UTC (rev 26699)
@@ -22,7 +22,6 @@
 from zope.security.management import setSecurityPolicy
 from zope.app.security.interfaces import IPermission
 from zope.app.security.permission import Permission
-from zope.app.security.protectclass import checkPermission
 from zope.app.security.principalregistry import principalRegistry
 
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/protectclass.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/protectclass.py	2004-07-23 09:39:13 UTC (rev 26698)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/protectclass.py	2004-07-23 09:40:18 UTC (rev 26699)
@@ -19,9 +19,7 @@
 from zope.security.checker import defineChecker, getCheckerForInstancesOf
 from zope.security.checker import Checker, CheckerPublic
 
-from permission import checkPermission
 
-
 def protectName(class_, name, permission):
     """Set a permission on a particular name."""
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalpermission.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalpermission.py	2004-07-23 09:39:13 UTC (rev 26698)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalpermission.py	2004-07-23 09:40:18 UTC (rev 26699)
@@ -22,7 +22,7 @@
 
 from zope.app.security.settings import Allow, Deny, Unset
 from zope.app.security.principal import checkPrincipal
-from zope.app.security.permission import checkPermission, allPermissions
+from zope.app.security.permission import allPermissions
 
 from zope.app.securitypolicy.securitymap import SecurityMap
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/rolepermission.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/rolepermission.py	2004-07-23 09:39:13 UTC (rev 26698)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/rolepermission.py	2004-07-23 09:40:18 UTC (rev 26699)
@@ -16,11 +16,10 @@
 """
 from zope.interface import implements
 
-from zope.app import zapi
 from zope.app.annotation.interfaces import IAnnotations
 
 from zope.app.security.settings import Allow, Deny, Unset
-from zope.app.security.permission import checkPermission, allPermissions
+from zope.app.security.permission import allPermissions
 from zope.app.securitypolicy.role import checkRole
 
 from zope.app.securitypolicy.interfaces import IRolePermissionManager