From 06e72c0e86ef685f071bca1538a3c43dffa65d9b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 19 Nov 2019 16:49:45 +0100 Subject: [PATCH] Simplify cache code.. --- moulinette/cache.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/moulinette/cache.py b/moulinette/cache.py index 4da4ece8..dad7b93b 100644 --- a/moulinette/cache.py +++ b/moulinette/cache.py @@ -25,7 +25,7 @@ def get_cachedir(subdir='', make_dir=True): return path -def open_cachefile(filename, mode='r', **kwargs): +def open_cachefile(filename, mode='r', subdir=''): """Open a cache file and return a stream Attempt to open in 'mode' the cache file 'filename' from the @@ -39,9 +39,6 @@ def open_cachefile(filename, mode='r', **kwargs): - **kwargs -- Optional arguments for get_cachedir """ - # Set make_dir if not given - kwargs['make_dir'] = kwargs.get('make_dir', - True if mode[0] == 'w' else False) - cache_dir = get_cachedir(**kwargs) + cache_dir = get_cachedir(subdir, make_dir=True if mode[0] == 'w' else False) file_path = os.path.join(cache_dir, filename) return open(file_path, mode)