From cd11784b8fdf0cb45783e8d6a8e9b5288f34820d Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 13 Jun 2013 22:48:29 +0900
Subject: pep8

---
 src/leap/services/abstractbootstrapper.py  | 18 +++++++++---------
 src/leap/services/eip/eipbootstrapper.py   |  4 ++--
 src/leap/services/eip/vpnlaunchers.py      |  2 +-
 src/leap/services/mail/smtpbootstrapper.py |  9 ++++-----
 4 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/leap/services')

diff --git a/src/leap/services/abstractbootstrapper.py b/src/leap/services/abstractbootstrapper.py
index 7bebdc15..2cbd56bc 100644
--- a/src/leap/services/abstractbootstrapper.py
+++ b/src/leap/services/abstractbootstrapper.py
@@ -48,14 +48,14 @@ class AbstractBootstrapper(QtCore.QObject):
         """
         QtCore.QObject.__init__(self)
 
-        leap_assert(self._gui_errback.im_func == \
-                        AbstractBootstrapper._gui_errback.im_func,
+        leap_assert(self._gui_errback.im_func ==
+                    AbstractBootstrapper._gui_errback.im_func,
                     "Cannot redefine _gui_errback")
-        leap_assert(self._errback.im_func == \
-                        AbstractBootstrapper._errback.im_func,
+        leap_assert(self._errback.im_func ==
+                    AbstractBootstrapper._errback.im_func,
                     "Cannot redefine _errback")
-        leap_assert(self._gui_notify.im_func == \
-                        AbstractBootstrapper._gui_notify.im_func,
+        leap_assert(self._gui_notify.im_func ==
+                    AbstractBootstrapper._gui_notify.im_func,
                     "Cannot redefine _gui_notify")
 
         # **************************************************** #
@@ -87,9 +87,9 @@ class AbstractBootstrapper(QtCore.QObject):
                 if self._err_msg is not None \
                 else str(failure.value)
             self._signal_to_emit.emit({
-                    self.PASSED_KEY: False,
-                    self.ERROR_KEY: err_msg
-                    })
+                self.PASSED_KEY: False,
+                self.ERROR_KEY: err_msg
+            })
             failure.trap(Exception)
 
     def _errback(self, failure, signal=None):
diff --git a/src/leap/services/eip/eipbootstrapper.py b/src/leap/services/eip/eipbootstrapper.py
index 51c3dab4..4da8f90f 100644
--- a/src/leap/services/eip/eipbootstrapper.py
+++ b/src/leap/services/eip/eipbootstrapper.py
@@ -173,8 +173,8 @@ class EIPBootstrapper(AbstractBootstrapper):
 
         cb_chain = [
             (self._download_config, self.download_config),
-            (self._download_client_certificates, \
-                 self.download_client_certificate)
+            (self._download_client_certificates,
+             self.download_client_certificate)
         ]
 
         self.addCallbackChain(cb_chain)
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index d15aed82..6c2ff006 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -319,7 +319,7 @@ class DarwinVPNLauncher(VPNLauncher):
     UP_SCRIPT = "%s/client.up.sh" % (OPENVPN_PATH,)
     DOWN_SCRIPT = "%s/client.down.sh" % (OPENVPN_PATH,)
     OPENVPN_DOWN_PLUGIN = '%s/openvpn-down-root.so' % (OPENVPN_PATH,)
-    
+
     UPDOWN_FILES = (UP_SCRIPT, DOWN_SCRIPT, OPENVPN_DOWN_PLUGIN)
 
     @classmethod
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/services/mail/smtpbootstrapper.py
index ea480c6d..e8af5349 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/services/mail/smtpbootstrapper.py
@@ -94,11 +94,10 @@ class SMTPBootstrapper(AbstractBootstrapper):
         # Not modified
         if res.status_code == 304:
             logger.debug("SMTP definition has not been modified")
-            self._smtp_config.load(os.path.join("leap",
-                                                "providers",
-                                                self._provider_config.\
-                                                    get_domain(),
-                                                "smtp-service.json"))
+            self._smtp_config.load(os.path.join(
+                "leap", "providers",
+                self._provider_config.get_domain(),
+                "smtp-service.json"))
         else:
             smtp_definition, mtime = get_content(res)
 
-- 
cgit v1.2.3