[CalendarServer-changes] [1922] CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/ twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1922
          http://trac.macosforge.org/projects/calendarserver/changeset/1922
Author:   cdaboo at apple.com
Date:     2007-09-27 14:21:18 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
APIs changed in PyOpenDirectory for backwards compatability, so we need to change to the new ones here.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/twistedcaldav/directory/appleopendirectory.py	2007-09-27 21:20:05 UTC (rev 1921)
+++ CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/twistedcaldav/directory/appleopendirectory.py	2007-09-27 21:21:18 UTC (rev 1922)
@@ -126,7 +126,7 @@
             if groupGUID in processedGUIDs:
                 continue
 
-            result = opendirectory.queryRecordsWithAttribute(
+            result = opendirectory.queryRecordsWithAttribute_list(
                 self.directory,
                 dsattributes.kDS1AttrGeneratedUID,
                 groupGUID,
@@ -188,7 +188,7 @@
             'dsAttrTypeNative:apple-serviceinfo',
         ]
 
-        records = opendirectory.queryRecordsWithAttributes(
+        records = opendirectory.queryRecordsWithAttributes_list(
             self.directory,
             dsquery.match(
                 'dsAttrTypeNative:apple-serviceinfo',
@@ -611,7 +611,7 @@
         if self.requireComputerRecord:
             if self.isWorkgroupServer and recordType == DirectoryService.recordType_users:
                 if shortName is None:
-                    results = opendirectory.queryRecordsWithAttribute(
+                    results = opendirectory.queryRecordsWithAttribute_list(
                         self.directory,
                         dsattributes.kDSNAttrRecordName,
                         _saclGroup,
@@ -671,7 +671,7 @@
         try:
             if query:
                 if isinstance(query, dsquery.match):
-                    results = opendirectory.queryRecordsWithAttribute(
+                    results = opendirectory.queryRecordsWithAttribute_list(
                         self.directory,
                         query.attribute,
                         query.value,
@@ -681,7 +681,7 @@
                         attrs,
                     )
                 else:
-                    results = opendirectory.queryRecordsWithAttributes(
+                    results = opendirectory.queryRecordsWithAttributes_list(
                         self.directory,
                         query.generate(),
                         False,
@@ -689,7 +689,7 @@
                         attrs,
                     )
             else:
-                results = opendirectory.listAllRecordsWithAttributes(
+                results = opendirectory.listAllRecordsWithAttributes_list(
                     self.directory,
                     listRecordType,
                     attrs,

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070927/63520b05/attachment.html