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

[source_changes at macosforge.org]

Revision: 11656
          http://trac.calendarserver.org//changeset/11656
Author:   cdaboo at apple.com
Date:     2013-09-06 07:35:51 -0700 (Fri, 06 Sep 2013)
Log Message:
-----------
Must not depend on caldavclientlibrary.

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

Modified: CalendarServer/trunk/calendarserver/tools/dbinspect.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/dbinspect.py	2013-09-05 20:44:26 UTC (rev 11655)
+++ CalendarServer/trunk/calendarserver/tools/dbinspect.py	2013-09-06 14:35:51 UTC (rev 11656)
@@ -22,8 +22,6 @@
 of simple commands.
 """
 
-from caldavclientlibrary.admin.xmlaccounts.recordtypes import recordType_users, \
-    recordType_locations, recordType_resources, recordType_groups
 from calendarserver.tools import tables
 from calendarserver.tools.cmdline import utilityMain
 from pycalendar.datetime import PyCalendarDateTime
@@ -38,6 +36,7 @@
 from twistedcaldav.config import config
 from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
 from twistedcaldav.directory import calendaruserproxy
+from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.query import calendarqueryfilter
 from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
 from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
@@ -104,13 +103,13 @@
     except (ValueError, TypeError):
         pass
 
-    record = txn.directoryService().recordWithShortName(recordType_users, value)
+    record = txn.directoryService().recordWithShortName(DirectoryService.recordType_users, value)
     if record is None:
-        record = txn.directoryService().recordWithShortName(recordType_locations, value)
+        record = txn.directoryService().recordWithShortName(DirectoryService.recordType_locations, value)
     if record is None:
-        record = txn.directoryService().recordWithShortName(recordType_resources, value)
+        record = txn.directoryService().recordWithShortName(DirectoryService.recordType_resources, value)
     if record is None:
-        record = txn.directoryService().recordWithShortName(recordType_groups, value)
+        record = txn.directoryService().recordWithShortName(DirectoryService.recordType_groups, value)
     return record.guid if record else None
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130906/322ed82c/attachment-0001.html>