Merge remote-tracking branch 'refs/remotes/ivan/bug/cosmetic-fixes' into develop

4 files changed, 6 insertions, 8 deletions

diff --git a/src/leap/bitmask/crypto/tests/fake_provider.py b/src/leap/bitmask/crypto/tests/fake_provider.py
index 54af485d..b8cdbb12 100755
--- a/src/leap/bitmask/crypto/tests/fake_provider.py
+++ b/src/leap/bitmask/crypto/tests/fake_provider.py
@@ -280,7 +280,6 @@ class FakeSession(Resource):
         if HAMK is None:
             print '[server] verification failed!!!'
             raise Exception("Authentication failed!")
-            #import ipdb;ipdb.set_trace()
 
         assert svr.authenticated()
         print "***"
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index db24a1c8..c078e3f4 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -20,8 +20,9 @@ Main window for Bitmask.
 import logging
 
 from threading import Condition
-from PySide import QtCore, QtGui
 from datetime import datetime
+
+from PySide import QtCore, QtGui
 from twisted.internet import threads
 from zope.proxy import ProxyBase, setProxiedObject
 
diff --git a/src/leap/bitmask/platform_init/locks.py b/src/leap/bitmask/platform_init/locks.py
index 34f884dc..78ebf4cd 100644
--- a/src/leap/bitmask/platform_init/locks.py
+++ b/src/leap/bitmask/platform_init/locks.py
@@ -83,8 +83,6 @@ if platform_init.IS_UNIX:
                 flock(self._fd, LOCK_EX | LOCK_NB)
             except IOError as exc:
                 # could not get the lock
-                #import ipdb; ipdb.set_trace()
-
                 if exc.args[0] in (errno.EDEADLK, errno.EAGAIN):
                     # errno 11 or 35
                     # Resource temporarily unavailable
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index f7217af6..9a292b18 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -508,10 +508,10 @@ class SoledadBootstrapper(AbstractBootstrapper):
         if flags.OFFLINE is True:
             args = (address, "https://localhost", self._soledad)
             kwargs = {
-                "session_id":  "",
-                "ca_cert_path":  "",
-                "api_uri":  "",
-                "api_version":  "",
+                "session_id": "",
+                "ca_cert_path": "",
+                "api_uri": "",
+                "api_version": "",
                 "uid": self._uuid,
                 "gpgbinary": self._get_gpg_bin_path()
             }