diff options
| author | kali <kali@leap.se> | 2013-01-28 04:48:21 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-28 04:48:21 +0900 |
| commit | e33c500ad3006670158493f2a12afc015610894d (patch) | |
| tree | 7541b15972982538cf2389fb869fe9ff1abcea3c | |
| parent | 29b009617b45aafa1af0ba5afe74a6b79f8b5ae9 (diff) | |
change dirspec dep by pyxdg
| -rw-r--r-- | pkg/requirements.pip | 2 | ||||
| -rw-r--r-- | src/leap/base/config.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 5b0b0d18..cbfbe8fb 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -12,7 +12,7 @@ pycrypto keyring python-dateutil sh -dirspec +pyxdg pygeoip # optional diff --git a/src/leap/base/config.py b/src/leap/base/config.py index e2f0beba..6a13db7d 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -12,7 +12,7 @@ import os logger = logging.getLogger(name=__name__) from dateutil import parser as dateparser -from dirspec import basedir +from xdg import BaseDirectory import requests from leap.base import exceptions @@ -286,7 +286,10 @@ def get_config_dir(): # we're inside a test! :) return os.path.join(home, ".config/leap") else: - return os.path.join(basedir.default_config_home, + # XXX dirspec is cross-platform, + # we should borrow some of those + # routines for osx/win and wrap this call. + return os.path.join(BaseDirectory.xdg_config_home, 'leap') |