Update upstream source from tag 'upstream/2017.12.31'

[youtubedl] / youtube_dl / cache.py

diff --git a/youtube_dl/cache.py b/youtube_dl/cache.py
index ac5925d32012d5dcac2e912d6d0ac3415560b447..7bdade1bdb49a7406457688400830a91a98ef186 100644 (file)
--- a/youtube_dl/cache.py
+++ b/youtube_dl/cache.py
@@ -8,8 +8,9 @@ import re
 import shutil
 import traceback
 
 import shutil
 import traceback
 

+from .compat import compat_getenv

 from .utils import (
 from .utils import (

-    compat_expanduser,
+    expand_path,

     write_json_file,
 )
 
     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:
     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')
             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), \