Imported Debian patch 2015.11.27.1-1.1

[youtubedl] / youtube_dl / cache.py

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

-from .utils import (
-    compat_expanduser,
-    write_json_file,
-)
+from .compat import compat_expanduser, compat_getenv
+from .utils import write_json_file

 
 
 class Cache(object):
 
 
 class Cache(object):


@@ -21,7 +19,7 @@ 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')
         return compat_expanduser(res)
 
             res = os.path.join(cache_root, 'youtube-dl')
         return compat_expanduser(res)