summaryrefslogtreecommitdiff
path: root/src/leap/baseapp
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-10-05 20:15:12 +0900
committerkali <kali@leap.se>2012-10-05 20:15:12 +0900
commit31c0afa5eb9bc7566ca39099520e8adc7b531e22 (patch)
tree5850ec279a39479209fa8d5f36137b56a18af329 /src/leap/baseapp
parent95ce59c8833cb2ba951630080cdbc1e6d756a666 (diff)
pep8
Diffstat (limited to 'src/leap/baseapp')
-rw-r--r--src/leap/baseapp/mainwindow.py5
-rw-r--r--src/leap/baseapp/network.py5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 000db8c9..e48666a4 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -10,6 +10,7 @@ from leap.baseapp.log import LogPaneMixin
from leap.baseapp.systray import StatusAwareTrayIconMixin
from leap.baseapp.network import NetworkCheckerAppMixin
from leap.baseapp.leap_app import MainWindowMixin
+from leap.baseapp import dialogs
logger = logging.getLogger(name=__name__)
@@ -68,6 +69,6 @@ class LeapWindow(QtGui.QMainWindow,
# check headless = False before
# launching dialog.
# (so Qt tests can assert stuff)
-
- dialog = ErrorDialog()
+
+ dialog = dialogs.ErrorDialog()
dialog.warningMessage(message, 'error')
diff --git a/src/leap/baseapp/network.py b/src/leap/baseapp/network.py
index c73e8062..f1859c7a 100644
--- a/src/leap/baseapp/network.py
+++ b/src/leap/baseapp/network.py
@@ -1,10 +1,10 @@
from __future__ import print_function
+
import logging
-import time
logger = logging.getLogger(name=__name__)
from leap.base.network import NetworkChecker
-from leap.baseapp.dialogs import ErrorDialog
+#from leap.baseapp.dialogs import ErrorDialog
class NetworkCheckerAppMixin(object):
@@ -20,4 +20,3 @@ class NetworkCheckerAppMixin(object):
debug=self.debugmode)
self.network_checker.run_checks()
-