3 files changed, 6 insertions, 8 deletions
diff --git a/client/setup.py b/client/setup.py
index 5d9955e6..dc555641 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -20,6 +20,9 @@ setup file for leap.soledad.client
 import re
 from setuptools import setup
 from setuptools import find_packages
+from setuptools import Command
+
+from pkg import utils
 
 import versioneer
 versioneer.versionfile_source = 'src/leap/soledad/client/_version.py'
@@ -27,8 +30,6 @@ versioneer.versionfile_build = 'leap/soledad/client/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
 versioneer.parentdir_prefix = 'leap.soledad.client-'
 
-from pkg import utils
-
 
 trove_classifiers = (
     "Development Status :: 3 - Alpha",
@@ -60,9 +61,6 @@ if len(_version_short) > 0:
 cmdclass = versioneer.get_cmdclass()
 
 
-from setuptools import Command
-
-
 class freeze_debianver(Command):
     """
     Freezes the version in a debian branch.
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py
index b91e497f..7afc9c6c 100644
--- a/client/src/leap/soledad/client/api.py
+++ b/client/src/leap/soledad/client/api.py
@@ -222,8 +222,8 @@ class Soledad(object):
         soledad_assert_type(self._passphrase, unicode)
 
         def initialize(attr, val):
-            return ((getattr(self, attr, None) is None)
-                    and setattr(self, attr, val))
+            return ((getattr(self, attr, None) is None) and
+                    setattr(self, attr, val))
 
         initialize("_secrets_path", os.path.join(
             self.default_prefix, self.secrets_file_name))
diff --git a/client/src/leap/soledad/client/encdecpool.py b/client/src/leap/soledad/client/encdecpool.py
index 69b0556b..2ad98767 100644
--- a/client/src/leap/soledad/client/encdecpool.py
+++ b/client/src/leap/soledad/client/encdecpool.py
@@ -136,6 +136,7 @@ class SyncEncryptDecryptPool(object):
         """
         return self._sync_db.runQuery(query, *args)
 
+
 def encrypt_doc_task(doc_id, doc_rev, content, key, secret):
     """
     Encrypt the content of the given document.
@@ -419,7 +420,6 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
         self._deferred_init = self._init_db()
         self._wait_init_db('_runOperation', '_runQuery')
 
-
     def _wait_init_db(self, *methods):
         """
         Methods that need to wait for db initialization.