[CalendarServer-changes] [12933] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools /shell/terminal.py

[source_changes at macosforge.org]

Revision: 12933
          http://trac.calendarserver.org//changeset/12933
Author:   sagen at apple.com
Date:     2014-03-17 13:57:56 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
terminal.py can get the directory from the store

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/terminal.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/terminal.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/terminal.py	2014-03-17 20:57:35 UTC (rev 12932)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/terminal.py	2014-03-17 20:57:56 UTC (rev 12933)
@@ -51,7 +51,6 @@
 from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
 
 from calendarserver.tools.cmdline import utilityMain, WorkerService
-from calendarserver.tools.util import getDirectory
 from calendarserver.tools.shell.cmd import Commands, UsageError as CommandUsageError
 
 log = Logger()
@@ -116,9 +115,9 @@
     @type config: L{twistedcaldav.config.Config}
     """
 
-    def __init__(self, store, directory, options, reactor, config):
+    def __init__(self, store, options, reactor, config):
         super(ShellService, self).__init__(store)
-        self.directory = directory
+        self.directory = store.directoryService()
         self.options = options
         self.reactor = reactor
         self.config = config
@@ -434,8 +433,7 @@
 
     def makeService(store):
         from twistedcaldav.config import config
-        directory = getDirectory()
-        return ShellService(store, directory, options, reactor, config)
+        return ShellService(store, options, reactor, config)
 
     print("Initializing shell...")
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140317/3981a375/attachment.html>