[CalendarServer-changes] [420] CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/ static.py

[source_changes at macosforge.org]

Revision: 420
          http://trac.macosforge.org/projects/calendarserver/changeset/420
Author:   wsanchez at apple.com
Date:     2006-11-09 17:43:43 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/static.py

Modified: CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/static.py	2006-11-10 01:37:55 UTC (rev 419)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/static.py	2006-11-10 01:43:43 UTC (rev 420)
@@ -62,7 +62,6 @@
     """
     CalDAV-accessible L{DAVFile} resource.
     """
-
     def __repr__(self):
         if self.isCalendarCollection():
             return "<%s (calendar collection): %s>" % (self.__class__.__name__, self.fp.path)
@@ -272,7 +271,6 @@
         
         return super(CalDAVFile, self).supportedPrivileges(request)
 
-
     ##
     # Public additions
     ##
@@ -827,14 +825,14 @@
     return (None, ())
 
 def _schedulePrivilegeSet():
-    all_privileges = None
-
-    for privilege in davPrivilegeSet.childrenOfType(davxml.SupportedPrivilege):
-        if isinstance(privilege.childOfType(davxml.Privilege).children[0], davxml.All):
-            all_privileges = list(privilege.childrenOfType(davxml.SupportedPrivilege))
+    for supported_privilege in davPrivilegeSet.childrenOfType(davxml.SupportedPrivilege):
+        all_privilege = supported_privilege.childOfType(davxml.Privilege)
+        all_description = supported_privilege.childOfType(davxml.Description)
+        if isinstance(all_privilege.children[0], davxml.All):
+            all_supported_privileges = list(supported_privilege.childrenOfType(davxml.SupportedPrivilege))
             break
 
-    all_privileges.append(
+    all_supported_privileges.append(
         davxml.SupportedPrivilege(
             davxml.Privilege(caldavxml.Schedule()),
             davxml.Description("schedule privileges for current principal", **{"xml:lang": "en"}),
@@ -842,11 +840,7 @@
     )
 
     return davxml.SupportedPrivilegeSet(
-        davxml.SupportedPrivilege(
-            davxml.Privilege(davxml.All()),
-            davxml.Description("all privileges", **{"xml:lang": "en"}),
-            *all_privileges
-        )
+        davxml.SupportedPrivilege(all_privilege, all_description, *all_supported_privileges)
     )
 
 schedulePrivilegeSet = _schedulePrivilegeSet()

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061109/7a476fa8/attachment.html