[CalendarServer-changes] [4474] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 4474
          http://trac.macosforge.org/projects/calendarserver/changeset/4474
Author:   sagen at apple.com
Date:     2009-07-24 11:30:54 -0700 (Fri, 24 Jul 2009)
Log Message:
-----------
Fix for the case where the directory service doesn't have full name values for users (or in AD terminology, "Display Name").  We fill in with an empty string now, rather than None.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/directory.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2009-07-24 17:10:49 UTC (rev 4473)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2009-07-24 18:30:54 UTC (rev 4474)
@@ -309,6 +309,9 @@
         if uid is None:
             uid = guid
 
+        if fullName is None:
+            fullName = ""
+
         if enabledForCalendaring is None:
             if recordType == service.recordType_groups:
                 enabledForCalendaring = False

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2009-07-24 17:10:49 UTC (rev 4473)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2009-07-24 18:30:54 UTC (rev 4474)
@@ -60,6 +60,24 @@
         def service(self):
             return self._service
 
+        def test_fullNameNone(self):
+            record = OpenDirectoryRecord(
+                service               = self.service(),
+                recordType            = DirectoryService.recordType_users,
+                guid                  = "B1F93EB1-DA93-4772-9141-81C250DA36C2",
+                nodeName              = "/LDAPv2/127.0.0.1",
+                shortNames            = ("user",),
+                authIDs               = set(),
+                fullName              = None,
+                firstName             = "Some",
+                lastName              = "User",
+                emailAddresses        = set(("someuser at example.com",)),
+                calendarUserAddresses = set(("mailtoguid at example.com",)),
+                enabledForCalendaring = True,
+                memberGUIDs           = [],
+            )
+            self.assertEquals(record.fullName, "")
+
         def test_invalidODDigest(self):
             record = OpenDirectoryRecord(
                 service               = self.service(),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090724/e0c07e48/attachment.html>