[CalendarServer-changes] [12743] CalendarServer/trunk/txdav/dps/server.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:19:35 PDT 2014
Revision: 12743
http://trac.calendarserver.org//changeset/12743
Author: dre at apple.com
Date: 2014-02-21 13:57:24 -0800 (Fri, 21 Feb 2014)
Log Message:
-----------
Conditional import of OpenDirectory; unblocks linux
Modified Paths:
--------------
CalendarServer/trunk/txdav/dps/server.py
Modified: CalendarServer/trunk/txdav/dps/server.py
===================================================================
--- CalendarServer/trunk/txdav/dps/server.py 2014-02-21 15:54:17 UTC (rev 12742)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-02-21 21:57:24 UTC (rev 12743)
@@ -20,7 +20,6 @@
from twext.python.log import Logger
from twext.who.idirectory import RecordType
-from twext.who.opendirectory import DirectoryService as ODDirectoryService
from twisted.application import service
from twisted.application.strports import service as strPortsService
from twisted.internet.defer import inlineCallbacks, returnValue
@@ -339,6 +338,7 @@
kwds = config.DirectoryProxy.Keywords
if directoryType == "OD":
+ from twext.who.opendirectory import DirectoryService as ODDirectoryService
directory = ODDirectoryService(*args, **kwds)
elif directoryType == "LDAP":
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/23874c23/attachment.html>
More information about the calendarserver-changes
mailing list