Make use of unified cache directory

jic-dtool · Apr 24, 2019 · 7f10554 · 7f10554
1 parent 350e914
commit 7f10554
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,9 @@ Added
 Changed
 ^^^^^^^
 
+- Cache environment variable changed from DTOOL_HTTP_CACHE_DIRECTORY to DTOOL_CACHE_DIRECTORY
+- Default cache directory changed from ``~/.cache/dtool/http`` to ``~/.cache/dtool``
+
 
 Deprecated
 ^^^^^^^^^^

diff --git a/dtool_http/storagebroker.py b/dtool_http/storagebroker.py
@@ -10,6 +10,7 @@
     get_config_value,
     mkdir_parents,
     generous_parse_uri,
+    DEFAULT_CACHE_PATH,
 )
 
 logger = logging.getLogger(__name__)
@@ -45,9 +46,9 @@ def __init__(self, uri, admin_metadata, config_path=None):
         )
 
         self._cache_abspath = get_config_value(
-            "DTOOL_HTTP_CACHE_DIRECTORY",
+            "DTOOL_CACHE_DIRECTORY",
             config_path=config_path,
-            default=os.path.expanduser("~/.cache/dtool/http")
+            default=DEFAULT_CACHE_PATH
         )
 
     # Helper functions

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -6,11 +6,13 @@
 import tempfile
 import threading
 from contextlib import contextmanager
-from urllib.parse import urlunparse
 
 import dtoolcore
+from dtoolcore.utils import urlunparse
+
 import pytest
 
+
 _HERE = os.path.dirname(__file__)
 _DATA = os.path.join(_HERE, "data")