[CalendarServer-changes] [11611] CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav /extensions.py

[source_changes at macosforge.org]

Revision: 11611
          http://trac.calendarserver.org//changeset/11611
Author:   cdaboo at apple.com
Date:     2013-08-16 09:11:08 -0700 (Fri, 16 Aug 2013)
Log Message:
-----------
Handle top-level "plain" web2 resources.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/extensions.py

Modified: CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/extensions.py	2013-08-16 15:56:06 UTC (rev 11610)
+++ CalendarServer/branches/users/cdaboo/fix-no-ischedule/twistedcaldav/extensions.py	2013-08-16 16:11:08 UTC (rev 11611)
@@ -494,13 +494,13 @@
             size = child.contentLength()
             lastModified = child.lastModified()
             rtypes = []
-            fullrtype = child.resourceType()
+            fullrtype = child.resourceType() if hasattr(child, "resourceType") else None
             if fullrtype is not None:
                 for rtype in fullrtype.children:
                     rtypes.append(rtype.name)
             if rtypes:
                 rtypes = "(%s)" % (", ".join(rtypes),)
-            if child.isCollection():
+            if child.isCollection() if hasattr(child, "isCollection") else False:
                 contentType = rtypes
             else:
                 mimeType = child.contentType()
@@ -1004,6 +1004,7 @@
     return tokens, context, applyTo, clientLimit, propElement
 
 
+
 def validateTokens(tokens):
     """
     Make sure there is at least one token longer than one character
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130816/eab413e3/attachment.html>