[CalendarServer-changes] [8290] CalendarServer/trunk/txdav/caldav/datastore

[source_changes at macosforge.org]

Revision: 8290
          http://trac.macosforge.org/projects/calendarserver/changeset/8290
Author:   sagen at apple.com
Date:     2011-11-15 10:32:13 -0800 (Tue, 15 Nov 2011)
Log Message:
-----------
If X-APPLE-DROPBOX value is empty, rather than returning an empty string, look at ATTACH or compute a value.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py
    CalendarServer/trunk/txdav/caldav/datastore/util.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py	2011-11-15 03:52:40 UTC (rev 8289)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py	2011-11-15 18:32:13 UTC (rev 8290)
@@ -90,7 +90,7 @@
 
 
     @inlineCallbacks
-    def test_badXdash(self):
+    def test_emptyXdash(self):
         resource = DropboxIDTests.FakeCalendarResource("""BEGIN:VCALENDAR
 VERSION:2.0
 BEGIN:VEVENT
@@ -103,7 +103,7 @@
 END:VCALENDAR
 """)
 
-        self.assertEquals( (yield dropboxIDFromCalendarObject(resource)), "")
+        self.assertEquals( (yield dropboxIDFromCalendarObject(resource)), "12345-67890.dropbox")
 
 
     @inlineCallbacks

Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/util.py	2011-11-15 03:52:40 UTC (rev 8289)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py	2011-11-15 18:32:13 UTC (rev 8290)
@@ -88,7 +88,7 @@
     # Try "X-APPLE-DROPBOX" first
     dropboxProperty = (yield calendarObject.component(
         )).getFirstPropertyInAnyComponent("X-APPLE-DROPBOX")
-    if dropboxProperty is not None:
+    if dropboxProperty is not None and dropboxProperty.value():
         componentDropboxID = dropboxProperty.value().rstrip("/").split("/")[-1]
         returnValue(componentDropboxID)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111115/92ab4390/attachment.html>