summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/mainwindow.py4
-rw-r--r--src/leap/gui/wizard.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 6ee8b028..6fe3e72d 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -321,7 +321,7 @@ class MainWindow(QtGui.QMainWindow):
# Refer to http://www.themacaque.com/?p=1067 for funny details.
self._wizard.show()
if IS_MAC:
- self._wizard._raise()
+ self._wizard.raise_()
self._wizard.finished.connect(self._wizard_finished)
def _wizard_finished(self):
@@ -1304,7 +1304,7 @@ class MainWindow(QtGui.QMainWindow):
self.setWindowFlags(self.windowFlags() & ~TOPFLAG)
self.show()
if IS_MAC:
- self._raise()
+ self.raise_()
def _cleanup_pidfiles(self):
"""
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 5333edeb..2b48fc81 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -309,8 +309,8 @@ class Wizard(QtGui.QWizard):
error_msg = json_content.get("errors").get("login")[0]
if not error_msg.istitle():
error_msg = "%s %s" % (old_username, error_msg)
- except:
- logger.error("Unknown error: %r" % (req.content,))
+ except Exception as e:
+ logger.error("Unknown error: %r" % (e,))
self._set_register_status(error_msg, error=True)
self.ui.btnRegister.setEnabled(True)