Merge branch 'release-0.7.0'0.7.0rc20.7.0rc1

1 files changed, 8 insertions, 12 deletions

diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 0223c053..ff9cae55 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -42,6 +42,7 @@ logger = logging.getLogger(__name__)
 
 
 class Wizard(QtGui.QWizard):
+
     """
     First run wizard to register a user and setup a provider
     """
@@ -96,11 +97,6 @@ class Wizard(QtGui.QWizard):
         # this details are set when the provider download is complete.
         self._provider_details = None
 
-        # We will store a reference to the defers for eventual use
-        # (eg, to cancel them) but not doing anything with them right now.
-        self._provider_select_defer = None
-        self._provider_setup_defer = None
-
         self._connect_and_track(self.currentIdChanged,
                                 self._current_id_changed)
 
@@ -322,7 +318,8 @@ class Wizard(QtGui.QWizard):
 
         user_ok, msg = username_checks(username)
         if user_ok:
-            pass_ok, msg = password_checks(username, password, password2)
+            pass_ok, msg, field = password_checks(
+                username, password, password2)
 
         if user_ok and pass_ok:
             self._set_register_status(self.tr("Starting registration..."))
@@ -479,8 +476,7 @@ class Wizard(QtGui.QWizard):
         self.button(QtGui.QWizard.BackButton).clearFocus()
 
         self.ui.lblNameResolution.setPixmap(self.QUESTION_ICON)
-        self._provider_select_defer = self._backend.\
-            provider_setup(provider=self._domain)
+        self._backend.provider_setup(provider=self._domain)
 
     @QtCore.Slot(bool)
     def _skip_provider_checks(self, skip):
@@ -678,8 +674,9 @@ class Wizard(QtGui.QWizard):
         Loads the services that the provider provides into the UI for
         the user to enable or disable.
         """
-        self.ui.grpServices.setTitle(
-            self.tr("Services by {0}").format(self._provider_details['domain']))
+        title = self.tr("Services by {0}").format(
+            self._provider_details['domain'])
+        self.ui.grpServices.setTitle(title)
 
         services = get_supported(self._provider_details['services'])
 
@@ -724,8 +721,7 @@ class Wizard(QtGui.QWizard):
             if not self._provider_setup_ok:
                 self._reset_provider_setup()
                 self.ui.lblDownloadCaCert.setPixmap(self.QUESTION_ICON)
-                self._provider_setup_defer = self._backend.\
-                    provider_bootstrap(provider=self._domain)
+                self._backend.provider_bootstrap(provider=self._domain)
 
         if pageId == self.PRESENT_PROVIDER_PAGE:
             details = self._provider_details