[CalendarServer-changes] [13300] CalendarServer/trunk/calendarserver/tools/dbinspect.py

[source_changes at macosforge.org]

Revision: 13300
          http://trac.calendarserver.org//changeset/13300
Author:   cdaboo at apple.com
Date:     2014-04-16 12:52:22 -0700 (Wed, 16 Apr 2014)
Log Message:
-----------
Update to new directory api.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/dbinspect.py

Modified: CalendarServer/trunk/calendarserver/tools/dbinspect.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/dbinspect.py	2014-04-16 18:20:59 UTC (rev 13299)
+++ CalendarServer/trunk/calendarserver/tools/dbinspect.py	2014-04-16 19:52:22 UTC (rev 13300)
@@ -25,20 +25,26 @@
 from calendarserver.tools import tables
 from calendarserver.tools.cmdline import utilityMain, WorkerService
 from pycalendar.datetime import DateTime
+
 from twext.enterprise.dal.syntax import Select, Parameter, Count, Delete, \
     Constant
+from twext.who.idirectory import RecordType
+
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twisted.python.filepath import FilePath
 from twisted.python.text import wordWrap
 from twisted.python.usage import Options
+
 from twistedcaldav import caldavxml
 from twistedcaldav.config import config
 from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
 from twistedcaldav.directory import calendaruserproxy
-from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
+
 from txdav.caldav.datastore.query.filter import Filter
 from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
+from txdav.who.idirectory import RecordType as CalRecordType
+
 from uuid import UUID
 import os
 import sys
@@ -102,13 +108,13 @@
     except (ValueError, TypeError):
         pass
 
-    record = txn.directoryService().recordWithShortName(DirectoryService.recordType_users, value)
+    record = txn.directoryService().recordWithShortName(RecordType.user, value)
     if record is None:
-        record = txn.directoryService().recordWithShortName(DirectoryService.recordType_locations, value)
+        record = txn.directoryService().recordWithShortName(CalRecordType.location, value)
     if record is None:
-        record = txn.directoryService().recordWithShortName(DirectoryService.recordType_resources, value)
+        record = txn.directoryService().recordWithShortName(CalRecordType.resource, value)
     if record is None:
-        record = txn.directoryService().recordWithShortName(DirectoryService.recordType_groups, value)
+        record = txn.directoryService().recordWithShortName(RecordType.group, value)
     return record.guid if record else None
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140416/231ac5f0/attachment.html>