[CalendarServer-changes] [12970] CalendarServer/branches/users/sagen/move2who-4

[source_changes at macosforge.org]

Revision: 12970
          http://trac.calendarserver.org//changeset/12970
Author:   sagen at apple.com
Date:     2014-03-19 09:55:24 -0700 (Wed, 19 Mar 2014)
Log Message:
-----------
recordsWithEmailAddress takes unicode

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/scheduling_store/caldav/resource.py
    CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py
    CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/scheduling_store/caldav/resource.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/scheduling_store/caldav/resource.py	2014-03-19 03:15:43 UTC (rev 12969)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/scheduling_store/caldav/resource.py	2014-03-19 16:55:24 UTC (rev 12970)
@@ -428,7 +428,7 @@
             principalURL = str(authz_principal)
             if principalURL:
                 authz = (yield request.locateResource(principalURL))
-                self._associatedTransaction._authz_uid = authz.record.guid
+                self._associatedTransaction._authz_uid = authz.record.uid
 
         # Log extended item
         if not hasattr(request, "extendedLogItems"):

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py	2014-03-19 03:15:43 UTC (rev 12969)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py	2014-03-19 16:55:24 UTC (rev 12970)
@@ -238,7 +238,7 @@
         return self._call(
             RecordsWithEmailAddressCommand,
             self._processMultipleRecords,
-            emailAddress=emailAddress
+            emailAddress=emailAddress.encode("utf-8")
         )
 
 

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py	2014-03-19 03:15:43 UTC (rev 12969)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py	2014-03-19 16:55:24 UTC (rev 12970)
@@ -128,7 +128,7 @@
     def test_emailAddress(self):
         if testMode == "xml":
             records = (yield self.directory.recordsWithEmailAddress(
-                "cdaboo at bitbucket.calendarserver.org"
+                u"cdaboo at bitbucket.calendarserver.org"
             ))
             self.assertEquals(len(records), 1)
             self.assertEquals(records[0].shortNames, [u"cdaboo"])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140319/6970b861/attachment-0001.html>