projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[test/test_socks] Add tests for SOCKS proxies
[youtube-dl]
/
youtube_dl
/
cache.py
diff --git
a/youtube_dl/cache.py
b/youtube_dl/cache.py
index 6cae53d221d9e6fbc2346adcd186e54473878ddd..5fe839eb1269586db95b9e25b4c8dabcdcd965d9 100644
(file)
--- a/
youtube_dl/cache.py
+++ b/
youtube_dl/cache.py
@@
-8,9
+8,8
@@
import re
import shutil
import traceback
import shutil
import traceback
-from .utils import (
- write_json_file,
-)
+from .compat import compat_expanduser, compat_getenv
+from .utils import write_json_file
class Cache(object):
class Cache(object):
@@
-20,13
+19,14
@@
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
os.path.
expanduser(res)
+ return
compat_
expanduser(res)
def _get_cache_fn(self, section, key, dtype):
def _get_cache_fn(self, section, key, dtype):
- assert re.match(r'^[a-zA-Z0-9_-]+$', section)
- assert re.match(r'^[a-zA-Z0-9_-]+$', key)
+ assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \
+ 'invalid section %r' % section
+ assert re.match(r'^[a-zA-Z0-9_.-]+$', key), 'invalid key %r' % key
return os.path.join(
self._get_root_dir(), section, '%s.%s' % (key, dtype))
return os.path.join(
self._get_root_dir(), section, '%s.%s' % (key, dtype))