[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Misc Updates and Upgrades

[Daniel Blackburn]

Log message for revision 84083:
  Misc Updates and Upgrades

Changed:
  U   z3c.securitytool/trunk/src/z3c/securitytool/README.txt
  U   z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
  U   z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py

-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/README.txt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2008-02-20 17:28:58 UTC (rev 84082)
+++ z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2008-02-20 17:34:59 UTC (rev 84083)
@@ -392,7 +392,7 @@
 Here we will test with the principal that was populated earlier.
     >>> prinDetails = PrincipalDetails(firstIssue)
     >>> daniel  = principals.definePrincipal('daniel','daniel','daniel')
-    >>> pprint(prinDetails.principalPermissions('daniel') )
+    >>> pprint(prinDetails('daniel') )
     {'groups': {},
      'permissionTree': [],
      'permissions': [],

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py	2008-02-20 17:28:58 UTC (rev 84082)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py	2008-02-20 17:34:59 UTC (rev 84083)
@@ -158,8 +158,8 @@
         principal_security = PrincipalDetails(self.context)
         #principal_security = ISecurityChecker(self.context)
 
-        self.principalPermissions = principal_security.principalPermissions(
-            self.principal, skin=skin)
+        self.principalPermissions = principal_security(self.principal,
+                                                       skin=skin)
 
         self.legend = (u"<span class='Deny'>Red Bold = Denied Permission"
                        u"</span>,<span class='Allow'> Green Normal = "
@@ -200,13 +200,6 @@
     pageTemplateFile = "permdetails.pt"
 
     def update(self):
-#        prinDetails = PermissionDetails(self.context)
-#        
-#        self.permissionDetails = prinDetails.permissionDetails(
-#            self.principal, self.view, skin=skin)
-
-        #self.permissionDetails = IPermissionDetails(self.context)(self.principal,self.view,skin)
-
         self.principal = self.request.get('principal','no user specified')
         self.view = self.request.get('view','no view specified')
         self.skin = getSkin(self.request) or IBrowserRequest

Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2008-02-20 17:28:58 UTC (rev 84082)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2008-02-20 17:34:59 UTC (rev 84083)
@@ -255,13 +255,7 @@
         self.context = context
         #self.secChecker = SecurityChecker(self.context)
 
-    def __call__(self,principal_id,view_name, skin=IBrowserRequest):
-        self.principal_id = principal_id
-        self.view_name = view_name
-        self.skin = skin
-
-
-    def principalPermissions(self, principal_id, skin=IBrowserRequest):
+    def __call__(self,principal_id, skin=IBrowserRequest):
         """Return all security settings (permissions, groups, roles)
            for all interfaces provided by this context for a
            `principal_id`, and of course we are only after browser views"""