Remove remains after files moving

4 files changed, 12 insertions, 12 deletions

diff --git a/sugar-network b/sugar-network
index b25bd5c..da222d6 100755
--- a/sugar-network
+++ b/sugar-network
@@ -33,7 +33,7 @@ from sugar_network.client.routes import ClientRoutes
 from sugar_network.node.routes import load_bundle
 from sugar_network.toolkit.router import Router, Request, Response
 from sugar_network.toolkit.spec import Spec
-from sugar_network.toolkit import application, coroutine, util
+from sugar_network.toolkit import application, coroutine
 from sugar_network.toolkit import Option, BUFFER_SIZE, enforce
 
 
@@ -90,7 +90,7 @@ class Application(application.Application):
         application.Application.__init__(self, **kwargs)
 
         application.rundir.value = join(client.local_root.value, 'run')
-        util.init_logging(application.debug.value)
+        toolkit.init_logging(application.debug.value)
 
         if not exists(toolkit.cachedir.value):
             os.makedirs(toolkit.cachedir.value)
@@ -243,7 +243,7 @@ class Application(application.Application):
             else:
                 pid_path = self.new_instance()
                 if not client.anonymous.value:
-                    util.ensure_key(client.key_path())
+                    toolkit.ensure_key(client.key_path())
                 cp = ClientRouter()
             result = cp.call(request, response)
         finally:
@@ -274,7 +274,7 @@ class Application(application.Application):
                 print dumps(result, indent=2)
         elif response.content_type == 'text/event-stream':
             while True:
-                chunk = util.readline(result)
+                chunk = toolkit.readline(result)
                 if not chunk:
                     break
                 sys.stdout.write(chunk)
diff --git a/sugar-network-client b/sugar-network-client
index b034d0a..3b14d1e 100755
--- a/sugar-network-client
+++ b/sugar-network-client
@@ -31,7 +31,7 @@ from sugar_network.client.routes import CachedClientRoutes
 from sugar_network.node import stats_node, stats_user
 from sugar_network.model import RESOURCES
 from sugar_network.toolkit.router import Router
-from sugar_network.toolkit import mountpoints, util, printf, application
+from sugar_network.toolkit import mountpoints, printf, application
 from sugar_network.toolkit import Option, coroutine
 
 
@@ -43,7 +43,7 @@ class Application(application.Daemon):
         node.sync_layers.value = client.layers.value
 
         self.jobs = coroutine.Pool()
-        util.init_logging(application.debug.value)
+        toolkit.init_logging(application.debug.value)
 
         new_root = (client.local_root.value != client.local_root.default)
         client.local_root.value = abspath(client.local_root.value)
@@ -104,7 +104,7 @@ class Application(application.Daemon):
         self.cmd_start()
 
     def run(self):
-        util.ensure_key(client.key_path())
+        toolkit.ensure_key(client.key_path())
         volume = db.Volume(client.path('db'), RESOURCES)
         routes = CachedClientRoutes(volume,
                 client.api_url.value if not client.server_mode.value else None)
@@ -153,7 +153,7 @@ class Application(application.Daemon):
         try:
             self.jobs.join()
         except KeyboardInterrupt:
-            util.exception('%s interrupted', self.name)
+            toolkit.exception('%s interrupted', self.name)
         finally:
             self.jobs.kill()
             routes.close()
diff --git a/sugar-network-node b/sugar-network-node
index 4f6ef84..1f78c60 100755
--- a/sugar-network-node
+++ b/sugar-network-node
@@ -30,7 +30,7 @@ from sugar_network.node.slave import SlaveRoutes
 from sugar_network.model import RESOURCES
 from sugar_network.toolkit.http import Connection
 from sugar_network.toolkit.router import Router
-from sugar_network.toolkit import coroutine, application, util, Option, enforce
+from sugar_network.toolkit import coroutine, application, Option, enforce
 
 
 class Application(application.Daemon):
@@ -47,7 +47,7 @@ class Application(application.Daemon):
                 'No write access to %r directory', node.data_root.value)
 
     def run(self):
-        util.init_logging(application.debug.value)
+        toolkit.init_logging(application.debug.value)
 
         ssl_args = {}
         if node.keyfile.value:
diff --git a/sugar_network/node/routes.py b/sugar_network/node/routes.py
index 5ef9d7c..34fa387 100644
--- a/sugar_network/node/routes.py
+++ b/sugar_network/node/routes.py
@@ -28,7 +28,7 @@ from sugar_network.toolkit.router import ACL, fallbackroute
 from sugar_network.toolkit.spec import EMPTY_LICENSE
 from sugar_network.toolkit.spec import parse_requires, ensure_requires
 from sugar_network.toolkit.bundle import Bundle
-from sugar_network.toolkit import http, coroutine, util, enforce
+from sugar_network.toolkit import http, coroutine, enforce
 
 
 _MAX_STATS_LENGTH = 100
@@ -138,7 +138,7 @@ class NodeRoutes(db.Routes, model.Routes):
     @route('POST', ['implementation'], cmd='release',
             mime_type='application/json')
     def release(self, request, document):
-        with util.NamedTemporaryFile() as blob:
+        with toolkit.NamedTemporaryFile() as blob:
             shutil.copyfileobj(request.content_stream, blob)
             blob.flush()
             with load_bundle(self.volume, blob.name, request) as impl: