[CalendarServer-changes] [3701] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 3701
          http://trac.macosforge.org/projects/calendarserver/changeset/3701
Author:   cdaboo at apple.com
Date:     2009-02-20 13:11:00 -0800 (Fri, 20 Feb 2009)
Log Message:
-----------
Maintain order of short names when removing duplicates.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-02-20 17:56:11 UTC (rev 3700)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-02-20 21:11:00 UTC (rev 3701)
@@ -470,10 +470,14 @@
             # Now get useful record info.
             recordGUID         = value.get(dsattributes.kDS1AttrGeneratedUID)
             recordShortNames   = value.get(dsattributes.kDSNAttrRecordName)
-            if isinstance(recordShortNames, str):
-                recordShortNames = (recordShortNames,)
+            if recordShortNames:
+                if isinstance(recordShortNames, str):
+                    recordShortNames = (recordShortNames,)
+                else:
+                    s = set()
+                    recordShortNames = tuple([(s.add(x), x)[1] for x in recordShortNames if x not in s])
             else:
-                recordShortNames = tuple(set(recordShortNames)) if recordShortNames else ()
+                recordShortNames = ()
             recordFullName     = value.get(dsattributes.kDS1AttrDistinguishedName)
             recordFirstName    = value.get(dsattributes.kDS1AttrFirstName)
             recordLastName     = value.get(dsattributes.kDS1AttrLastName)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090220/429c9803/attachment.html>