Move spec.py and bundle.py to toolkit module

6 files changed, 8 insertions, 9 deletions

diff --git a/sugar_network/client/cache.py b/sugar_network/client/cache.py
index ea2f8ca..d3930c8 100644
--- a/sugar_network/client/cache.py
+++ b/sugar_network/client/cache.py
@@ -18,7 +18,7 @@ import shutil
 from os.path import exists, join
 
 from sugar_network.client import IPCClient, local_root
-from sugar_network.client.bundle import Bundle
+from sugar_network.toolkit.bundle import Bundle
 from sugar_network.toolkit import pipe, util
 
 
diff --git a/sugar_network/client/clones.py b/sugar_network/client/clones.py
index ac44fe6..9c240d3 100644
--- a/sugar_network/client/clones.py
+++ b/sugar_network/client/clones.py
@@ -21,12 +21,11 @@ import logging
 from os.path import join, exists, lexists, relpath, dirname, basename, isdir
 from os.path import abspath, islink
 
-from sugar_network import db
-from sugar_network.client.spec import Spec
+from sugar_network import db, client
+from sugar_network.toolkit.spec import Spec
 from sugar_network.toolkit.inotify import Inotify, \
         IN_DELETE_SELF, IN_CREATE, IN_DELETE, IN_CLOSE_WRITE, \
         IN_MOVED_TO, IN_MOVED_FROM
-from sugar_network import client
 from sugar_network.toolkit import coroutine, util, exception
 
 
diff --git a/sugar_network/client/commands.py b/sugar_network/client/commands.py
index f69d8cb..404ddf9 100644
--- a/sugar_network/client/commands.py
+++ b/sugar_network/client/commands.py
@@ -21,9 +21,9 @@ from os.path import join
 from sugar_network import db, client, node, toolkit
 from sugar_network.toolkit import netlink, mountpoints
 from sugar_network.client import journal, clones, injector
-from sugar_network.client.spec import Spec
 from sugar_network.resources.volume import Volume, Commands
 from sugar_network.node.slave import SlaveCommands
+from sugar_network.toolkit.spec import Spec
 from sugar_network.toolkit import zeroconf, coroutine, util, http
 from sugar_network.toolkit import exception, enforce
 
diff --git a/sugar_network/client/bundle.py b/sugar_network/toolkit/bundle.py
index 0e9bbca..d7b12f1 100644
--- a/sugar_network/client/bundle.py
+++ b/sugar_network/toolkit/bundle.py
@@ -14,11 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import tarfile
-import zipfile
 from os.path import join
 
-from sugar_network.client.spec import Spec
+from sugar_network.toolkit.spec import Spec
 
 
 class BundleError(Exception):
@@ -34,11 +32,13 @@ class Bundle(object):
             mime_type = _detect_mime_type(bundle) or ''
 
         if mime_type == 'application/zip':
+            import zipfile
             self._bundle = zipfile.ZipFile(bundle)
             self._do_get_names = self._bundle.namelist
             self._do_extractfile = self._bundle.open
             self._do_extract = self._bundle.extract
         elif mime_type.split('/')[-1].endswith('-tar'):
+            import tarfile
             self._bundle = tarfile.open(bundle)
             self._do_get_names = self._bundle.getnames
             self._do_extractfile = self._bundle.extractfile
diff --git a/sugar_network/client/spec.py b/sugar_network/toolkit/spec.py
index d9c617d..d9c617d 100644
--- a/sugar_network/client/spec.py
+++ b/sugar_network/toolkit/spec.py
diff --git a/tests/units/client/spec.py b/tests/units/client/spec.py
index a9b4aae..891dbe8 100755
--- a/tests/units/client/spec.py
+++ b/tests/units/client/spec.py
@@ -5,7 +5,7 @@ from cStringIO import StringIO
 
 from __init__ import tests
 
-from sugar_network.client import spec
+from sugar_network.toolkit import spec
 
 
 class SpecTest(tests.Test):