[CalendarServer-changes] [13075] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools /resources.py

[source_changes at macosforge.org]

Revision: 13075
          http://trac.calendarserver.org//changeset/13075
Author:   wsanchez at apple.com
Date:     2014-03-31 18:12:02 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
Don't use calendarserver.platform.darwin.od.

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py	2014-04-01 01:03:36 UTC (rev 13074)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py	2014-04-01 01:12:02 UTC (rev 13075)
@@ -34,7 +34,6 @@
 from twistedcaldav.directory.directory import DirectoryService, DirectoryError
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 
-from calendarserver.platform.darwin.od import dsattributes
 from calendarserver.tools.util import loadConfig, setupMemcached, checkDirectory
 from txdav.who.util import directoryFromConfig
 
@@ -188,8 +187,8 @@
     """
 
     attrs = [
-        dsattributes.kDS1AttrGeneratedUID,
-        dsattributes.kDS1AttrDistinguishedName,
+        "dsAttrTypeStandard:GeneratedUID",
+        "dsAttrTypeStandard:RealName",
     ]
 
     if verbose:
@@ -216,13 +215,13 @@
     augmentRecords = []
 
     for recordTypeOD, recordType in (
-        (dsattributes.kDSStdRecordTypeResources, DirectoryService.recordType_resources),
-        (dsattributes.kDSStdRecordTypePlaces, DirectoryService.recordType_locations),
+        ("dsRecTypeStandard:Resources", DirectoryService.recordType_resources),
+        ("dsRecTypeStandard:Places", DirectoryService.recordType_locations),
     ):
         data = queryMethod(sourceService, recordTypeOD, verbose=verbose)
         for recordName, val in data:
-            guid = val.get(dsattributes.kDS1AttrGeneratedUID, None)
-            fullName = val.get(dsattributes.kDS1AttrDistinguishedName, None)
+            guid = val.get("dsAttrTypeStandard:GeneratedUID", None)
+            fullName = val.get("dsAttrTypeStandard:RealName", None)
             if guid and fullName:
                 if not recordName:
                     recordName = guid
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140331/e0a1dc15/attachment.html>