Annotate changelog with bug being closed.

[youtubedl] / youtube_dl / cache.py

diff --git a/youtube_dl/cache.py b/youtube_dl/cache.py
index 5fe839eb1269586db95b9e25b4c8dabcdcd965d9..7bdade1bdb49a7406457688400830a91a98ef186 100644 (file)
--- a/youtube_dl/cache.py
+++ b/youtube_dl/cache.py
@@ -8,8 +8,11 @@ import re
 import shutil
 import traceback
 
 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):
 
 
 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')
         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), \
 
     def _get_cache_fn(self, section, key, dtype):
         assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \