[CalendarServer-changes] [10902] CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav

[source_changes at macosforge.org]

Revision: 10902
          http://trac.calendarserver.org//changeset/10902
Author:   gaya at apple.com
Date:     2013-03-12 16:32:12 -0700 (Tue, 12 Mar 2013)
Log Message:
-----------
remove changes to compliance classes for address book home.

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/directory/addressbook.py
    CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/resource.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/directory/addressbook.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/directory/addressbook.py	2013-03-12 23:08:33 UTC (rev 10901)
+++ CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/directory/addressbook.py	2013-03-12 23:32:12 UTC (rev 10902)
@@ -33,14 +33,13 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 
-from twistedcaldav import mkcolxml
 from twistedcaldav.config import config
 from twistedcaldav.directory.idirectory import IDirectoryService
 
-from twistedcaldav.directory.common import CommonUIDProvisioningResource, \
+from twistedcaldav.directory.common import CommonUIDProvisioningResource,\
     uidsResourceName, CommonHomeTypeProvisioningResource
 
-from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVResource, \
+from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVResource,\
     DAVResourceWithChildrenMixin
 from twistedcaldav.resource import AddressBookHomeResource
 
@@ -52,13 +51,11 @@
 # FIXME: copied from resource.py to avoid circular dependency
 class CalDAVComplianceMixIn(object):
     def davComplianceClasses(self):
-        result = tuple(super(CalDAVComplianceMixIn, self).davComplianceClasses()) \
+        return (
+            tuple(super(CalDAVComplianceMixIn, self).davComplianceClasses())
             + config.CalDAVComplianceClasses
-        if mkcolxml.mkcol_compliance in result:
-            list(result).remove(mkcolxml.mkcol_compliance)
-        return tuple(result)
+        )
 
-
 class DirectoryAddressBookProvisioningResource (
     ReadOnlyResourceMixIn,
     CalDAVComplianceMixIn,
@@ -132,7 +129,7 @@
     ##
     # DAV
     ##
-
+    
     def isCollection(self):
         return True
 
@@ -186,7 +183,7 @@
     ##
     # DAV
     ##
-
+    
     def isCollection(self):
         return True
 

Modified: CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/resource.py	2013-03-12 23:08:33 UTC (rev 10901)
+++ CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/resource.py	2013-03-12 23:32:12 UTC (rev 10902)
@@ -57,7 +57,7 @@
 from twext.web2.http_headers import MimeType, ETag
 from twext.web2.stream import MemoryStream
 
-from twistedcaldav import caldavxml, customxml, carddavxml, mkcolxml
+from twistedcaldav import caldavxml, customxml, carddavxml
 from twistedcaldav.cache import PropfindCacheMixin, DisabledCacheNotifier, \
     CacheStoreNotifier
 from twistedcaldav.caldavxml import caldav_namespace
@@ -2731,7 +2731,7 @@
 
 
 
-class AddressBookHomeResource (CommonHomeResource, CalDAVComplianceMixIn):
+class AddressBookHomeResource (CommonHomeResource):
     """
     Address book home collection resource.
     """
@@ -2739,17 +2739,11 @@
 
     def __init__(self, *args, **kw):
         super(AddressBookHomeResource, self).__init__(*args, **kw)
+        # get some Access header items
         self.http_MKCOL = None
         self.http_MKCALENDAR = None
+        
 
-
-    def davComplianceClasses(self):
-        result = super(CalDAVComplianceMixIn, self).davComplianceClasses()
-        if mkcolxml.mkcol_compliance in result:
-            list(result).remove(mkcolxml.mkcol_compliance)
-        return tuple(result)
-
-
     @classmethod
     @inlineCallbacks
     def homeFromTransaction(cls, transaction, uid):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130312/d3cc08af/attachment-0001.html>