[CalendarServer-changes] [15559] CalendarServer/trunk/calendarserver/tap/util.py

[source_changes at macosforge.org]

Revision: 15559
          http://trac.calendarserver.org//changeset/15559
Author:   wsanchez at apple.com
Date:     2016-04-27 14:50:27 -0700 (Wed, 27 Apr 2016)
Log Message:
-----------
Import data store when we know which type we want

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2016-04-27 20:55:07 UTC (rev 15558)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2016-04-27 21:50:27 UTC (rev 15559)
@@ -87,9 +87,7 @@
 from txdav.caldav.datastore.scheduling.ischedule.dkim import DKIMUtils, DomainKeyResource
 from txdav.caldav.datastore.scheduling.ischedule.localservers import buildServersDB
 from txdav.caldav.datastore.scheduling.ischedule.resource import IScheduleInboxResource
-from txdav.common.datastore.file import CommonDataStore as CommonFileDataStore
 from txdav.common.datastore.podding.resource import ConduitResource
-from txdav.common.datastore.sql import CommonDataStore as CommonSQLDataStore
 from txdav.common.datastore.sql import current_sql_schema
 from txdav.common.datastore.upgrade.sql.upgrade import NotAllowedToUpgrade
 from txdav.dps.client import DirectoryService as DirectoryProxyClientService
@@ -292,6 +290,7 @@
         else:
             uri = "https://{config.ServerHostName}:{config.HTTPPort}".format(config=config)
         attachments_uri = uri + "/calendars/__uids__/%(home)s/dropbox/%(dropbox_id)s/%(name)s"
+        from txdav.common.datastore.sql import CommonDataStore as CommonSQLDataStore
         store = CommonSQLDataStore(
             txnFactory, notifierFactories,
             directoryService,
@@ -310,6 +309,7 @@
             cacheExpireSeconds=config.QueryCaching.ExpireSeconds
         )
     else:
+        from txdav.common.datastore.file import CommonDataStore as CommonFileDataStore
         store = CommonFileDataStore(
             FilePath(config.DocumentRoot),
             notifierFactories, directoryService,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160427/3a07b261/attachment.html>