X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/46113edab215c2211a604c06245c16d5d4e57dcf..0f0afa2a182178f8c70d50daf99f864372fe71f3:/youtube_dl/cache.py?ds=sidebyside diff --git a/youtube_dl/cache.py b/youtube_dl/cache.py index ac5925d..7bdade1 100644 --- a/youtube_dl/cache.py +++ b/youtube_dl/cache.py @@ -8,8 +8,9 @@ import re import shutil import traceback +from .compat import compat_getenv from .utils import ( - compat_expanduser, + expand_path, write_json_file, ) @@ -21,9 +22,9 @@ class Cache(object): def _get_root_dir(self): res = self._ydl.params.get('cachedir') if res is None: - cache_root = os.environ.get('XDG_CACHE_HOME', '~/.cache') + cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache') res = os.path.join(cache_root, 'youtube-dl') - return compat_expanduser(res) + return expand_path(res) def _get_cache_fn(self, section, key, dtype): assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \