[CalendarServer-changes] [10983] CalendarServer/trunk/calendarserver/tools/principals.py

[source_changes at macosforge.org]

Revision: 10983
          http://trac.calendarserver.org//changeset/10983
Author:   sagen at apple.com
Date:     2013-04-02 18:26:14 -0700 (Tue, 02 Apr 2013)
Log Message:
-----------
Resolve conflict in principals.py

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

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2013-04-03 01:26:13 UTC (rev 10982)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2013-04-03 01:26:14 UTC (rev 10983)
@@ -39,11 +39,7 @@
     action_removeProxyPrincipal
 )
 from twistedcaldav.directory.augment import allowedAutoScheduleModes
-from calendarserver.tools.cmdline import utilityMain
 
-# FIXME: Move WorkerService to a util module?
-from calendarserver.tools.purge import WorkerService
-
 from calendarserver.tools.cmdline import utilityMain, WorkerService
 
 
@@ -479,6 +475,8 @@
 
 
 
+
+
 @inlineCallbacks
 def setProxies(store, principal, readProxyPrincipals, writeProxyPrincipals, directory=None):
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130402/9b036af9/attachment.html>