diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-09-30 11:28:12 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-09-30 11:28:12 -0300 |
commit | ac502ce982de1191a0af89683db517fe7c90914b (patch) | |
tree | ccb3b1c7ebec50e457eb4cc99dee69da058d5c43 /src/leap/bitmask/gui/wizard.py | |
parent | 4728ea9e5cbb0f7ed47e7ca609c0531a31c847e0 (diff) | |
parent | 37e27011b7bd8d5fe7825b1757f0b381fe8467e5 (diff) |
Merge remote-tracking branch 'kali/feature/provider_check_against_ca_bundle' into develop
Diffstat (limited to 'src/leap/bitmask/gui/wizard.py')
-rw-r--r-- | src/leap/bitmask/gui/wizard.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index 45734b81..bb38b136 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -14,7 +14,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - """ First run wizard """ @@ -27,15 +26,13 @@ from functools import partial from PySide import QtCore, QtGui from twisted.internet import threads -from leap.bitmask.config import flags from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.crypto.srpregister import SRPRegister -from leap.bitmask.util.privilege_policies import is_missing_policy_permissions +from leap.bitmask.provider.providerbootstrapper import ProviderBootstrapper +from leap.bitmask.services import get_service_display_name, get_supported from leap.bitmask.util.request_helpers import get_content from leap.bitmask.util.keyring_helpers import has_keyring from leap.bitmask.util.password import basic_password_checks -from leap.bitmask.services.eip.providerbootstrapper import ProviderBootstrapper -from leap.bitmask.services import get_service_display_name, get_supported from ui_wizard import Ui_Wizard |