[CalendarServer-changes] [7163] CalendarServer/trunk/calendarserver/platform/darwin/od

[source_changes at macosforge.org]

Revision: 7163
          http://trac.macosforge.org/projects/calendarserver/changeset/7163
Author:   sagen at apple.com
Date:     2011-03-09 11:19:35 -0800 (Wed, 09 Mar 2011)
Log Message:
-----------
Search terms must be converted to unicode when calling OpenDirectory.framework

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py
    CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2011-03-09 03:41:33 UTC (rev 7162)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2011-03-09 19:19:35 UTC (rev 7163)
@@ -184,7 +184,7 @@
         recordType,
         attr,
         adjustMatchType(matchType, casei),
-        value,
+        value.decode("utf-8"),
         attributes,
         count,
         None)

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py	2011-03-09 03:41:33 UTC (rev 7162)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py	2011-03-09 19:19:35 UTC (rev 7163)
@@ -827,7 +827,7 @@
                 else:
                     self.assertTrue(type(value) is str)
 
-        def test_nonascii_record(self):
+        def test_nonascii_record_by_guid(self):
 
             directory = opendirectory.odInit("/Search")
 
@@ -846,3 +846,23 @@
                 result[dsattributes.kDS1AttrDistinguishedName],
                 "Unicode Test \xc3\x90"
             )
+
+        def test_nonascii_record_by_name(self):
+
+            directory = opendirectory.odInit("/Search")
+
+            results = opendirectory.queryRecordsWithAttribute_list(
+                directory,
+                dsattributes.kDS1AttrDistinguishedName,
+                "Unicode Test \xc3\x90",
+                dsattributes.eDSExact,
+                False,
+                dsattributes.kDSStdRecordTypeUsers,
+                USER_ATTRIBUTES,
+                count=0
+            )
+            result = results[0][1]
+            self.assertEquals(
+                result[dsattributes.kDS1AttrGeneratedUID],
+                "CA795296-D77A-4E09-A72F-869920A3D284"
+            )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110309/781b2934/attachment.html>