[CalendarServer-changes] [479] CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/ directory

[source_changes at macosforge.org]

Revision: 479
          http://trac.macosforge.org/projects/calendarserver/changeset/479
Author:   wsanchez at apple.com
Date:     2006-11-15 17:49:57 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Implement listRecords() for users.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/apache.py
    CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/test/test_apache.py

Modified: CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/apache.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/apache.py	2006-11-15 23:23:46 UTC (rev 478)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/apache.py	2006-11-16 01:49:57 UTC (rev 479)
@@ -28,6 +28,7 @@
 from twisted.python.filepath import FilePath
 
 from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
+from twistedcaldav.directory.directory import UnknownRecordTypeError
 
 class FileDirectoryService(DirectoryService):
     """
@@ -52,7 +53,15 @@
         return recordTypes
 
     def listRecords(self, recordType):
-        raise NotImplementedError()
+        if recordType == "user":
+            for entry in self.userFile.open():
+                if entry and entry[0] != "#":
+                    user, password = entry.split(":")
+                    yield user
+        elif recordType == "group":
+            raise NotImplementedError()
+        else:
+            raise UnknownRecordTypeError("Unknown record type: %s" % (recordType,))
 
     def recordWithShortName(self, recordType, shortName):
         raise NotImplementedError()

Modified: CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/test/test_apache.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/test/test_apache.py	2006-11-15 23:23:46 UTC (rev 478)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/test/test_apache.py	2006-11-16 01:49:57 UTC (rev 479)
@@ -70,8 +70,6 @@
         service = FileDirectoryService(basicUserFile)
         self.assertEquals(set(service.listRecords("user")), set(users.keys()))
 
-    test_listRecords_user.todo = "unimplemented"
-
     def test_listRecords_group(self):
         """
         FileDirectoryService.listRecords("group")

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061115/9334eeff/attachment.html