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

[source_changes at macosforge.org]

Revision: 2011
          http://trac.macosforge.org/projects/calendarserver/changeset/2011
Author:   cdaboo at apple.com
Date:     2007-11-15 07:45:06 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
Oops - wrong super class used.

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

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2007-11-15 04:15:10 UTC (rev 2010)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2007-11-15 15:45:06 UTC (rev 2011)
@@ -32,8 +32,6 @@
 
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred, maybeDeferred, succeed
-from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
 from twisted.web2.dav.idav import IDAVPrincipalCollectionResource
@@ -58,9 +56,6 @@
 from twistedcaldav.ical import allowedComponents
 from twistedcaldav.ical import Component as iComponent
 
-from twistedcaldav.directory.directory import DirectoryService
-from twistedcaldav.directory.sudo import SudoDirectoryService
-
 if twistedcaldav.__version__:
     serverVersion = twisted.web2.server.VERSION + " TwistedCalDAV/" + twistedcaldav.__version__
 else:
@@ -490,7 +485,7 @@
         extra_compliance = caldavxml.caldav_compliance
         if config.EnableProxyPrincipals:
             extra_compliance += customxml.calendarserver_proxy_compliance
-        return tuple(super(CalDAVResource, self).davComplianceClasses()) + extra_compliance
+        return tuple(super(CalendarPrincipalResource, self).davComplianceClasses()) + extra_compliance
 
     liveProperties = tuple(DAVPrincipalResource.liveProperties) + (
         (caldav_namespace, "calendar-home-set"        ),

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20071115/03707c44/attachment.html