diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-28 15:49:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-28 15:49:26 -0300 |
| commit | df9c43ec8d239595a40602b0e94125484a2144b2 (patch) | |
| tree | cd9b65724171a3d1e1a5cdf302bd3168b9654207 | |
| parent | 963e648a33dc6bb0358d788a747a29f9c403018d (diff) | |
| parent | bffc2f8712af48640f107f24f0724c68c6610e5f (diff) | |
Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' into develop
| -rw-r--r-- | client/changes/feature-3574_use-dirspec-instead-of-plain-xdg | 1 | ||||
| -rw-r--r-- | client/pkg/requirements.pip | 1 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/__init__.py | 7 |
3 files changed, 3 insertions, 6 deletions
diff --git a/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg b/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg new file mode 100644 index 00000000..9bdc5071 --- /dev/null +++ b/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg @@ -0,0 +1 @@ + o Use dirspec instead of plain xdg. Closes #3574. diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 86b79bb2..df6ddb94 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -2,7 +2,6 @@ pysqlcipher simplejson u1db scrypt -pyxdg pycryptopp # diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index df2b30c2..c6fbeac4 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -37,12 +37,11 @@ import socket import ssl import errno - -from xdg import BaseDirectory from hashlib import sha256 from u1db.remote import http_client from u1db.remote.ssl_match_hostname import match_hostname +from leap.common.config import get_path_prefix # # Signaling function @@ -218,9 +217,7 @@ class Soledad(object): Keys used to access storage secrets in recovery documents. """ - DEFAULT_PREFIX = os.path.join( - BaseDirectory.xdg_config_home, - 'leap', 'soledad') + DEFAULT_PREFIX = os.path.join(get_path_prefix(), 'leap', 'soledad') """ Prefix for default values for path. """ |