From ea00bc02d9722a670067667df752921d2c824389 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 25 Jan 2013 07:00:10 +0900
Subject: use dirspec

---
 src/leap/base/config.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/leap/base/config.py')

diff --git a/src/leap/base/config.py b/src/leap/base/config.py
index 9583a46a..6d43a895 100644
--- a/src/leap/base/config.py
+++ b/src/leap/base/config.py
@@ -11,6 +11,7 @@ import os
 logger = logging.getLogger(name=__name__)
 
 from dateutil import parser as dateparser
+import dirspec
 import requests
 
 from leap.base import exceptions
@@ -279,15 +280,8 @@ def get_config_dir():
     @rparam: config path
     @rtype: string
     """
-    # TODO
-    # check for $XDG_CONFIG_HOME var?
-    # get a more sensible path for win/mac
-    # kclair: opinion? ^^
-
-    return os.path.expanduser(
-        os.path.join('~',
-                     '.config',
-                     'leap'))
+    return os.path.join(dirspec.basedir.default_config_home,
+                        'leap')
 
 
 def get_config_file(filename, folder=None):
-- 
cgit v1.2.3


From a1d880f201c914777daa8f416d5c25ab03e5b05d Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 25 Jan 2013 07:20:43 +0900
Subject: use dirspec for cross-platform friendly directories

---
 src/leap/base/config.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/leap/base/config.py')

diff --git a/src/leap/base/config.py b/src/leap/base/config.py
index 6d43a895..e2f0beba 100644
--- a/src/leap/base/config.py
+++ b/src/leap/base/config.py
@@ -4,6 +4,7 @@ Configuration Base Class
 import grp
 import json
 import logging
+import re
 import socket
 import time
 import os
@@ -11,7 +12,7 @@ import os
 logger = logging.getLogger(name=__name__)
 
 from dateutil import parser as dateparser
-import dirspec
+from dirspec import basedir
 import requests
 
 from leap.base import exceptions
@@ -280,7 +281,12 @@ def get_config_dir():
     @rparam: config path
     @rtype: string
     """
-    return os.path.join(dirspec.basedir.default_config_home,
+    home = os.path.expanduser("~")
+    if re.findall("leap_tests-[a-zA-Z0-9]{6}", home):
+        # we're inside a test! :)
+        return os.path.join(home, ".config/leap")
+    else:
+        return os.path.join(basedir.default_config_home,
                         'leap')
 
 
-- 
cgit v1.2.3