[CalendarServer-changes] [5321] CalendarServer/trunk/twistedcaldav/resource.py

[source_changes at macosforge.org]

Revision: 5321
          http://trac.macosforge.org/projects/calendarserver/changeset/5321
Author:   wsanchez at apple.com
Date:     2010-03-16 13:53:19 -0700 (Tue, 16 Mar 2010)
Log Message:
-----------
Calculate davComplianceClasses once in config module.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/resource.py

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2010-03-16 20:20:31 UTC (rev 5320)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2010-03-16 20:53:19 UTC (rev 5321)
@@ -77,23 +77,13 @@
 else:
     serverVersion = twext.web2.server.VERSION + " TwistedCardDAV/?"
 
-class CalDAVComplianceMixIn(object):
 
+class CalDAVComplianceMixIn(object):
     def davComplianceClasses(self):
-        if config.Scheduling.CalDAV.OldDraftCompatibility:
-            extra_compliance = caldavxml.caldav_full_compliance
-        else:
-            extra_compliance = caldavxml.caldav_implicit_compliance
-        if config.EnableProxyPrincipals:
-            extra_compliance += customxml.calendarserver_proxy_compliance
-        if config.EnablePrivateEvents:
-            extra_compliance += customxml.calendarserver_private_events_compliance
-        if config.Scheduling.CalDAV.get("EnablePrivateComments", True):
-            extra_compliance += customxml.calendarserver_private_comments_compliance
-        extra_compliance += customxml.calendarserver_principal_property_search
-        if config.EnableCardDAV:
-            extra_compliance += carddavxml.carddav_compliance
-        return tuple(super(CalDAVComplianceMixIn, self).davComplianceClasses()) + extra_compliance
+        return (
+            tuple(super(CalDAVComplianceMixIn, self).davComplianceClasses())
+            + config.CalDAVComplianceClasses
+        )
 
 
 class CalDAVResource (CalDAVComplianceMixIn, DAVResource, LoggingMixIn):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100316/44b74347/attachment.html>