[CalendarServer-changes] [2148] CalendarServer/branches/users/cdaboo/private_events-2098/ twistedcaldav

[source_changes at macosforge.org]

Revision: 2148
          http://trac.macosforge.org/projects/calendarserver/changeset/2148
Author:   cdaboo at apple.com
Date:     2008-02-18 08:55:32 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
Re-work compliance class mix-in to make better use of inheritance.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/directory/calendaruserproxy.py
    CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/resource.py

Modified: CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/directory/calendaruserproxy.py	2008-02-18 16:23:48 UTC (rev 2147)
+++ CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/directory/calendaruserproxy.py	2008-02-18 16:55:32 UTC (rev 2148)
@@ -73,14 +73,11 @@
         # Permissions here are fixed, and are not subject to inherritance rules, etc.
         return succeed(self.defaultAccessControlList())
 
-class CalendarUserProxyPrincipalResource (AutoProvisioningFileMixIn, PermissionsMixIn, DAVPrincipalResource, DAVFile, CalDAVComplianceMixIn):
+class CalendarUserProxyPrincipalResource (CalDAVComplianceMixIn, AutoProvisioningFileMixIn, PermissionsMixIn, DAVPrincipalResource, DAVFile):
     """
     Calendar user proxy principal resource.
     """
 
-    def davComplianceClasses(self):
-        return tuple(super(CalendarUserProxyPrincipalResource, self).davComplianceClasses()) + self.caldavComplianceClasses()
-
     def __init__(self, path, parent, proxyType):
         """
         @param path: the path to the file which will back this resource.

Modified: CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/resource.py	2008-02-18 16:23:48 UTC (rev 2147)
+++ CalendarServer/branches/users/cdaboo/private_events-2098/twistedcaldav/resource.py	2008-02-18 16:55:32 UTC (rev 2148)
@@ -66,16 +66,16 @@
 
 class CalDAVComplianceMixIn(object):
 
-    def caldavComplianceClasses(self):
+    def davComplianceClasses(self):
         extra_compliance = caldavxml.caldav_compliance
         if config.EnableProxyPrincipals:
             extra_compliance += customxml.calendarserver_proxy_compliance
         if config.EnablePrivateEvents:
             extra_compliance += customxml.calendarserver_private_events_compliance
-        return extra_compliance
+        return tuple(super(CalDAVComplianceMixIn, self).davComplianceClasses()) + extra_compliance
 
 
-class CalDAVResource (DAVResource, CalDAVComplianceMixIn):
+class CalDAVResource (CalDAVComplianceMixIn, DAVResource):
     """
     CalDAV resource.
 
@@ -133,9 +133,6 @@
     # WebDAV
     ##
 
-    def davComplianceClasses(self):
-        return tuple(super(CalDAVResource, self).davComplianceClasses()) + self.caldavComplianceClasses()
-
     liveProperties = DAVResource.liveProperties + (
         (dav_namespace,    "owner"),               # Private Events needs this but it is also OK to return empty
         (caldav_namespace, "supported-calendar-component-set"),
@@ -562,7 +559,7 @@
             ),
         )
 
-class CalendarPrincipalResource (DAVPrincipalResource, CalDAVComplianceMixIn):
+class CalendarPrincipalResource (CalDAVComplianceMixIn, DAVPrincipalResource):
     """
     CalDAV principal resource.
 
@@ -570,9 +567,6 @@
     """
     implements(ICalendarPrincipalResource)
 
-    def davComplianceClasses(self):
-        return tuple(super(CalendarPrincipalResource, self).davComplianceClasses()) + self.caldavComplianceClasses()
-
     liveProperties = tuple(DAVPrincipalResource.liveProperties) + (
         (caldav_namespace, "calendar-home-set"        ),
         (caldav_namespace, "calendar-user-address-set"),

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080218/625f2447/attachment.html