[CalendarServer-changes] [392] CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/ directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 392
          http://trac.macosforge.org/projects/calendarserver/changeset/392
Author:   wsanchez at apple.com
Date:     2006-11-07 19:20:51 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Simplify.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/appleopendirectory.py	2006-11-08 03:20:01 UTC (rev 391)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/appleopendirectory.py	2006-11-08 03:20:51 UTC (rev 392)
@@ -45,42 +45,25 @@
         return ("user", "group", "resource")
 
     def listRecords(self, recordType):
-        def makeRecord(shortName, guid, lastModified, principalURI):
-            if not guid:
-                return None
-
-            ##
-            # FIXME: Also verify that principalURI is on this server
-            # Which probably means that the host information needs to be on
-            # the site object, and that we need the site object passed to
-            # __init__() here.
-            ##
-
-            return OpenDirectoryRecord(
-                directory = self,
-                recordType = recordType,
-                guid = guid,
-                shortName = shortName,
-                fullName = None,
-            )
-
         if recordType == "user":
-            for data in opendirectory.listUsers(self._directory):
-                yield makeRecord(*data)
-            return
+            listRecords = opendirectory.listUsers
+        elif recordType == "group":
+            listRecords = opendirectory.listGroups
+        elif recordType == "resource":
+            listRecords = opendirectory.listResources
+        else:
+            raise AssertionError("Unknown Open Directory record type: %s" % (recordType,))
 
-        if recordType == "group":
-            for data in opendirectory.listGroups(self._directory):
-                yield makeRecord(*data)
-            return
+        for shortName, guid, lastModified, principalURI in opendirectory.listUsers(self._directory):
+            if guid:
+                yield OpenDirectoryRecord(
+                    directory = self,
+                    recordType = recordType,
+                    guid = guid,
+                    shortName = shortName,
+                    fullName = None,
+                )
 
-        if recordType == "resource":
-            for data in opendirectory.listResources(self._directory):
-                yield makeRecord(*data)
-            return
-
-        raise AssertionError("Unknown Open Directory record type: %s" % (recordType,))
-
     def recordWithShortName(self, recordType, shortName):
         if recordType == "user":
             result = opendirectory.listUsersWithAttributes(self._directory, [shortName])

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061107/35d993c0/attachment.html