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

[source_changes at macosforge.org]

Revision: 15511
          http://trac.calendarserver.org//changeset/15511
Author:   cdaboo at apple.com
Date:     2016-04-15 17:58:05 -0700 (Fri, 15 Apr 2016)
Log Message:
-----------
Current clients expect multi-locations to have space after \; as the separator.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2016-04-15 19:11:37 UTC (rev 15510)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2016-04-16 00:58:05 UTC (rev 15511)
@@ -3504,7 +3504,7 @@
                         changed = True
 
             # Update the LOCATION
-            newLocationValue = ";".join(existingLocations)
+            newLocationValue = "; ".join(existingLocations)
             if newLocationValue != existingLocationValue:
                 newLocProperty = Property(
                     "LOCATION",

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2016-04-15 19:11:37 UTC (rev 15510)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2016-04-16 00:58:05 UTC (rev 15511)
@@ -2948,7 +2948,7 @@
         locProp = components[0].getProperty("LOCATION")
         self.assertEquals(
             locProp.value(),
-            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014;Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014; Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
         )
         structProps = tuple(components[0].properties("X-APPLE-STRUCTURED-LOCATION"))
         self.assertEqual(len(structProps), 2)
@@ -2985,7 +2985,7 @@
         locProp = components[0].getProperty("LOCATION")
         self.assertEquals(
             locProp.value(),
-            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014;Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014; Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
         )
         structProps = tuple(components[0].properties("X-APPLE-STRUCTURED-LOCATION"))
         self.assertEqual(len(structProps), 2)
@@ -3063,7 +3063,7 @@
         locProp = components[0].getProperty("LOCATION")
         self.assertEquals(
             locProp.value(),
-            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014;Unstructured Location;Mercury Seven;Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014; Unstructured Location; Mercury Seven; Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
         )
         structProps = tuple(components[0].properties("X-APPLE-STRUCTURED-LOCATION"))
         self.assertEqual(len(structProps), 3)
@@ -3132,7 +3132,7 @@
         locProp = components[0].getProperty("LOCATION")
         self.assertEquals(
             locProp.value(),
-            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014;Unstructured Location;Falafel Stop\n1325 Sunnyvale Saratoga, Sunnyvale, CA 94087;Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+            "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014; Unstructured Location; Falafel Stop\n1325 Sunnyvale Saratoga, Sunnyvale, CA 94087; Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
         )
 
         yield self.commit()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160415/365dec74/attachment.html>