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

[source_changes at macosforge.org]

Revision: 2554
          http://trac.macosforge.org/projects/calendarserver/changeset/2554
Author:   dreid at apple.com
Date:     2008-06-12 11:47:00 -0700 (Thu, 12 Jun 2008)

Log Message:
-----------
Remove AccessDisabled property.

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

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2008-06-06 23:10:51 UTC (rev 2553)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2008-06-12 18:47:00 UTC (rev 2554)
@@ -253,31 +253,9 @@
     # ACL
     ##
 
-    def disable(self, disabled=True):
-        """
-        Completely disables all access to this resource, regardless of ACL
-        settings.
-        @param disabled: If true, disabled all access. If false, enables access.
-        """
-        if disabled:
-            self.writeDeadProperty(AccessDisabled())
-        else:
-            self.removeDeadProperty(AccessDisabled())
-
-    def isDisabled(self):
-        """
-        @return: C{True} if access to this resource is disabled, C{False}
-            otherwise.
-        """
-        return self.hasDeadProperty(AccessDisabled)
-
     # FIXME: Perhaps this is better done in authorize() instead.
     @deferredGenerator
     def accessControlList(self, request, *args, **kwargs):
-        if self.isDisabled():
-            yield None
-            return
-
         d = waitForDeferred(super(CalDAVResource, self).accessControlList(request, *args, **kwargs))
         yield d
         acls = d.getResult()
@@ -748,13 +726,6 @@
 # Utilities
 ##
 
-class AccessDisabled (davxml.WebDAVEmptyElement):
-    namespace = davxml.twisted_private_namespace
-    name = "caldav-access-disabled"
-
-davxml.registerElement(AccessDisabled)
-
-
 def isCalendarCollectionResource(resource):
     try:
         resource = ICalDAVResource(resource)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080612/64e622f0/attachment.htm