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

[source_changes at macosforge.org]

Revision: 6154
          http://trac.macosforge.org/projects/calendarserver/changeset/6154
Author:   cdaboo at apple.com
Date:     2010-08-20 10:12:57 -0700 (Fri, 20 Aug 2010)
Log Message:
-----------
Clean-up imports. Fix canonicalURL parent tracking.

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

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2010-08-20 16:23:31 UTC (rev 6153)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2010-08-20 17:12:57 UTC (rev 6154)
@@ -30,8 +30,6 @@
 ]
 
 from urlparse import urlsplit
-from uuid import uuid4
-import datetime
 import urllib
 import uuid
 
@@ -45,7 +43,6 @@
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred, succeed, maybeDeferred, fail
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twisted.python.failure import Failure
 
 from twext.web2 import responsecode, http, http_headers
 from twext.web2.dav import davxml
@@ -55,7 +52,8 @@
 from twext.web2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource,\
     davPrivilegeSet
 from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.util import joinURL, parentForURL, normalizeURL
+from twext.web2.dav.util import joinURL, parentForURL, normalizeURL,\
+    unimplemented
 from twext.web2.http import HTTPError, RedirectResponse, StatusResponse, Response
 from twext.web2.http_headers import MimeType
 from twext.web2.stream import MemoryStream
@@ -80,8 +78,6 @@
 from twistedcaldav.icaldav import ICalDAVResource, ICalendarPrincipalResource
 from twistedcaldav.index import SyncTokenValidException, Index
 from twistedcaldav.linkresource import LinkResource
-from twistedcaldav.memcachelock import MemcacheLock, MemcacheLockTimeoutError
-from twistedcaldav.notify import getNodeCacher
 from twistedcaldav.notify import getPubSubConfiguration, getPubSubPath,\
     getPubSubXMPPURI, getPubSubHeartbeatURI
 from twistedcaldav.sharing import SharedCollectionMixin, SharedHomeMixin
@@ -1032,7 +1028,7 @@
                     if depth == "infinity":
                         yield child.findSpecialCollectionsFaster(type, depth, request, callback, privileges)                
 
-    def createCalendar(self, request):
+    def createdCalendar(self, request):
         """
         See L{ICalDAVResource.createCalendar}.
         This implementation raises L{NotImplementedError}; a subclass must
@@ -1256,7 +1252,7 @@
             lastpath = path.split("/")[-1]
             
             parent = (yield request.locateResource(parentForURL(myurl)))
-            if parent:
+            if parent and isinstance(parent, CalDAVResource):
                 canonical_parent = (yield parent.canonicalURL(request))
                 self._canonical_url = joinURL(canonical_parent, lastpath)
             else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100820/a0b1870f/attachment.html>