diff options
| author | Filippo Valsorda <hi@filippo.io> | 2018-01-07 15:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 15:03:28 +0100 |
| commit | 97bc05116e15df3cf1b7b7216c60fad7ee0acc9f (patch) | |
| tree | 453059413184d22a44241d251a82196c5d2461eb /youtube_dl/cache.py | |
| parent | 7608a91ee7b40c74a35c30b44731606382702592 (diff) | |
| parent | 0a5b1295b7c1aa6395b65ee137087c540b37b32b (diff) | |
| download | youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.tar.gz youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.tar.xz youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.zip | |
Merge branch 'master' into totalwebcasting totalwebcasting
Diffstat (limited to 'youtube_dl/cache.py')
| -rw-r--r-- | youtube_dl/cache.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/youtube_dl/cache.py b/youtube_dl/cache.py index 5fe839eb1..7bdade1bd 100644 --- a/youtube_dl/cache.py +++ b/youtube_dl/cache.py @@ -8,8 +8,11 @@ import re import shutil import traceback -from .compat import compat_expanduser, compat_getenv -from .utils import write_json_file +from .compat import compat_getenv +from .utils import ( + expand_path, + write_json_file, +) class Cache(object): @@ -21,7 +24,7 @@ class Cache(object): if res is None: 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), \ |