From abf688c7d643b89a1001a9f7c7ff24a4a3dab42c Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 14 Aug 2017 18:07:37 -0400
Subject: [style] pep8

---
 src/leap/bitmask/gui/app.py      | 10 +++++-----
 src/leap/bitmask/gui/app2.py     |  7 ++-----
 src/leap/bitmask/vpn/_control.py |  6 +++---
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/leap')

diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
index 3d380bc..38a37c4 100644
--- a/src/leap/bitmask/gui/app.py
+++ b/src/leap/bitmask/gui/app.py
@@ -106,8 +106,8 @@ class BrowserWindow(QWebView):
         self.loadPage(self.url)
 
         self.proxy = AppProxy(self) if first else None
-        #self.frame.addToJavaScriptWindowObject(
-        #    "bitmaskApp", self.proxy)
+        self.frame.addToJavaScriptWindowObject(
+            "bitmaskApp", self.proxy)
 
         icon = QtGui.QIcon()
         icon.addPixmap(
@@ -132,9 +132,9 @@ class BrowserWindow(QWebView):
 
         url = QtCore.QUrl(web_page)
         # TODO -- port this to QWebEngine
-        #self.frame = self.page().mainFrame()
-        #self.frame.addToJavaScriptWindowObject(
-        #    "bitmaskBrowser", self.bitmask_browser)
+        self.frame = self.page().mainFrame()
+        self.frame.addToJavaScriptWindowObject(
+            "bitmaskBrowser", self.bitmask_browser)
         self.load(url)
 
     def shutdown(self, *args):
diff --git a/src/leap/bitmask/gui/app2.py b/src/leap/bitmask/gui/app2.py
index f037a00..e540f49 100644
--- a/src/leap/bitmask/gui/app2.py
+++ b/src/leap/bitmask/gui/app2.py
@@ -17,8 +17,8 @@
 
 """
 Main entrypoint for the Bitmask Qt GUI.
-It just launches a webview browser that runs the local web-ui served by bitmaskd
-when the web service is running.
+It just launches a webview browser that runs the local web-ui served by
+bitmaskd when the web service is running.
 """
 
 import os
@@ -36,7 +36,6 @@ import psutil
 
 from leap.bitmask.core.launcher import run_bitmaskd, pid
 from leap.common.config import get_path_prefix
-#from leap.bitmask.gui import app_rc
 
 
 DEBUG = os.environ.get("DEBUG", False)
@@ -83,7 +82,6 @@ class BrowserWindow(object):
 
         webview.create_window('Bitmask', self.url)
 
-
     def loadPage(self, web_page):
         self.load(url)
 
@@ -101,7 +99,6 @@ class BrowserWindow(object):
         print('[bitmask] shutting down gui...')
 
 
-
 def launch_gui():
     global bitmaskd
     global browser
diff --git a/src/leap/bitmask/vpn/_control.py b/src/leap/bitmask/vpn/_control.py
index 7cf41d1..ac683a2 100644
--- a/src/leap/bitmask/vpn/_control.py
+++ b/src/leap/bitmask/vpn/_control.py
@@ -91,9 +91,9 @@ class VPNControl(object):
         # generic watchers
 
         poll_list = [
-                     LoopingCall(vpnproc.pollStatus),
-                     LoopingCall(vpnproc.pollState),
-                     LoopingCall(vpnproc.pollLog)]
+            LoopingCall(vpnproc.pollStatus),
+            LoopingCall(vpnproc.pollState),
+            LoopingCall(vpnproc.pollLog)]
         self._pollers.extend(poll_list)
         self._start_pollers()
         return True
-- 
cgit v1.2.3