diff options
author | Micah Lee <micah@micahflee.com> | 2018-09-30 17:35:58 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2018-09-30 17:35:58 -0700 |
commit | c572ab996a54d41c26d3e5ce99d5b38ebc406323 (patch) | |
tree | fb1d147a0c21f26a0d5050dcb8bfdba3eadda0f3 /onionshare | |
parent | 60afaaf338d2c49ffd93a605a90bb645cf37955a (diff) | |
download | onionshare-c572ab996a54d41c26d3e5ce99d5b38ebc406323.tar.gz onionshare-c572ab996a54d41c26d3e5ce99d5b38ebc406323.zip |
Fix tests
Diffstat (limited to 'onionshare')
-rw-r--r-- | onionshare/settings.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/onionshare/settings.py b/onionshare/settings.py index 811ad032..ed827cbd 100644 --- a/onionshare/settings.py +++ b/onionshare/settings.py @@ -122,8 +122,13 @@ class Settings(object): """ p = platform.system() if p == 'Windows': - appdata = os.environ['APPDATA'] - return '{}\\OnionShare\\onionshare.json'.format(appdata) + try: + appdata = os.environ['APPDATA'] + return '{}\\OnionShare\\onionshare.json'.format(appdata) + except: + # If for some reason we don't have the 'APPDATA' environment variable + # (like running tests in Linux while pretending to be in Windows) + return os.path.expanduser('~/.config/onionshare/onionshare.json') elif p == 'Darwin': return os.path.expanduser('~/Library/Application Support/OnionShare/onionshare.json') else: |