summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--changes/VERSION_COMPAT1
-rw-r--r--pkg/requirements.pip1
-rw-r--r--src/leap/bitmask/gui/login.py2
-rw-r--r--src/leap/bitmask/provider/providerbootstrapper.py4
-rw-r--r--src/leap/bitmask/provider/tests/test_providerbootstrapper.py3
-rw-r--r--src/leap/bitmask/services/__init__.py5
-rw-r--r--src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py13
7 files changed, 14 insertions, 15 deletions
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT
index 425478c8..ac2d2e73 100644
--- a/changes/VERSION_COMPAT
+++ b/changes/VERSION_COMPAT
@@ -9,3 +9,4 @@
# BEGIN DEPENDENCY LIST -------------------------
# leap.foo.bar>=x.y.z
leap.common >= 0.3.4 # because the ca_bundle
+leap.keymanager >= 0.3.3 # because the gnupg dep
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 154e51b4..269a4646 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -14,7 +14,6 @@ psutil
ipaddr
twisted
qt4reactor
-python-gnupg
python-daemon # this should not be needed for Windows.
keyring
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py
index 324280b9..c635081c 100644
--- a/src/leap/bitmask/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
@@ -330,7 +330,7 @@ class LoginWidget(QtGui.QWidget):
self.set_password("")
self.set_enabled(True)
- self.set_status("")
+ self.set_status("", error=False)
def set_login_status(self, msg, error=False):
"""
diff --git a/src/leap/bitmask/provider/providerbootstrapper.py b/src/leap/bitmask/provider/providerbootstrapper.py
index a10973f0..1b5947e1 100644
--- a/src/leap/bitmask/provider/providerbootstrapper.py
+++ b/src/leap/bitmask/provider/providerbootstrapper.py
@@ -27,7 +27,7 @@ from PySide import QtCore
from leap.bitmask.config.providerconfig import ProviderConfig, MissingCACert
from leap.bitmask.util.request_helpers import get_content
-from leap.bitmask.util import get_path_prefix
+from leap.bitmask import util
from leap.bitmask.util.constants import REQUEST_TIMEOUT
from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
from leap.bitmask.provider.supportedapis import SupportedAPIs
@@ -156,7 +156,7 @@ class ProviderBootstrapper(AbstractBootstrapper):
# Watch out! We're handling the verify paramenter differently here.
headers = {}
- provider_json = os.path.join(get_path_prefix(),
+ provider_json = os.path.join(util.get_path_prefix(),
"leap",
"providers",
self._domain, "provider.json")
diff --git a/src/leap/bitmask/provider/tests/test_providerbootstrapper.py b/src/leap/bitmask/provider/tests/test_providerbootstrapper.py
index fe5b52bd..88a4ff0b 100644
--- a/src/leap/bitmask/provider/tests/test_providerbootstrapper.py
+++ b/src/leap/bitmask/provider/tests/test_providerbootstrapper.py
@@ -43,7 +43,6 @@ from leap.bitmask.provider.providerbootstrapper import UnsupportedProviderAPI
from leap.bitmask.provider.providerbootstrapper import WrongFingerprint
from leap.bitmask.provider.supportedapis import SupportedAPIs
from leap.bitmask import util
-from leap.bitmask.util import get_path_prefix
from leap.common.files import mkdir_p
from leap.common.testing.https_server import where
from leap.common.testing.basetest import BaseLeapTest
@@ -406,7 +405,7 @@ class ProviderBootstrapperActiveTest(unittest.TestCase):
:returns: the provider.json path used
:rtype: str
"""
- provider_dir = os.path.join(get_path_prefix(),
+ provider_dir = os.path.join(util.get_path_prefix(),
"leap", "providers",
self.pb._domain)
mkdir_p(provider_dir)
diff --git a/src/leap/bitmask/services/__init__.py b/src/leap/bitmask/services/__init__.py
index e19b82b9..f9456159 100644
--- a/src/leap/bitmask/services/__init__.py
+++ b/src/leap/bitmask/services/__init__.py
@@ -27,7 +27,7 @@ from leap.bitmask.crypto.srpauth import SRPAuth
from leap.bitmask.util.constants import REQUEST_TIMEOUT
from leap.bitmask.util.privilege_policies import is_missing_policy_permissions
from leap.bitmask.util.request_helpers import get_content
-from leap.bitmask.util import get_path_prefix
+from leap.bitmask import util
from leap.common.check import leap_assert
from leap.common.config.baseconfig import BaseConfig
@@ -105,8 +105,7 @@ def download_service_config(provider_config, service_config,
service_name = service_config.name
service_json = "{0}-service.json".format(service_name)
headers = {}
- mtime = get_mtime(os.path.join(service_config
- .get_path_prefix(),
+ mtime = get_mtime(os.path.join(util.get_path_prefix(),
"leap", "providers",
provider_config.get_domain(),
service_json))
diff --git a/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
index fed4a783..6640a860 100644
--- a/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
@@ -41,6 +41,7 @@ from leap.bitmask.services.eip.eipconfig import EIPConfig
from leap.bitmask.config.providerconfig import ProviderConfig
from leap.bitmask.crypto.tests import fake_provider
from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask import util
from leap.common.testing.basetest import BaseLeapTest
from leap.common.files import mkdir_p
@@ -60,13 +61,13 @@ class EIPBootstrapperActiveTest(BaseLeapTest):
def setUp(self):
self.eb = EIPBootstrapper()
- self.old_pp = EIPConfig.get_path_prefix
+ self.old_pp = util.get_path_prefix
self.old_save = EIPConfig.save
self.old_load = EIPConfig.load
self.old_si = SRPAuth.get_session_id
def tearDown(self):
- EIPConfig.get_path_prefix = self.old_pp
+ util.get_path_prefix = self.old_pp
EIPConfig.save = self.old_save
EIPConfig.load = self.old_load
SRPAuth.get_session_id = self.old_si
@@ -97,13 +98,13 @@ class EIPBootstrapperActiveTest(BaseLeapTest):
pc.get_ca_cert_path = mock.MagicMock(return_value=False)
path_prefix = tempfile.mkdtemp()
- EIPConfig.get_path_prefix = mock.MagicMock(return_value=path_prefix)
+ util.get_path_prefix = mock.MagicMock(return_value=path_prefix)
EIPConfig.save = mock.MagicMock()
EIPConfig.load = mock.MagicMock()
self.eb._download_if_needed = ifneeded
- provider_dir = os.path.join(EIPConfig.get_path_prefix(),
+ provider_dir = os.path.join(util.get_path_prefix(),
"leap",
"providers",
pc.get_domain())
@@ -184,13 +185,13 @@ class EIPBootstrapperActiveTest(BaseLeapTest):
pc.get_ca_cert_path = mock.MagicMock(return_value=False)
path_prefix = tempfile.mkdtemp()
- EIPConfig.get_path_prefix = mock.MagicMock(return_value=path_prefix)
+ util.get_path_prefix = mock.MagicMock(return_value=path_prefix)
EIPConfig.save = mock.MagicMock()
EIPConfig.load = mock.MagicMock()
self.eb._download_if_needed = ifneeded
- provider_dir = os.path.join(EIPConfig.get_path_prefix(),
+ provider_dir = os.path.join(util.get_path_prefix(),
"leap",
"providers",
"somedomain")
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 18:37:16 +0000