diff options
Diffstat (limited to 'pycadf/openstack/common/fileutils.py')
| -rw-r--r-- | pycadf/openstack/common/fileutils.py | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/pycadf/openstack/common/fileutils.py b/pycadf/openstack/common/fileutils.py index e2506bd..426c570 100644 --- a/pycadf/openstack/common/fileutils.py +++ b/pycadf/openstack/common/fileutils.py @@ -18,7 +18,8 @@ import errno import os import tempfile -from pycadf.openstack.common import excutils +from oslo.utils import excutils + from pycadf.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -50,8 +51,8 @@ def read_cached_file(filename, force_reload=False): """ global _FILE_CACHE - if force_reload and filename in _FILE_CACHE: - del _FILE_CACHE[filename] + if force_reload: + delete_cached_file(filename) reloaded = False mtime = os.path.getmtime(filename) @@ -66,6 +67,17 @@ def read_cached_file(filename, force_reload=False): return (reloaded, cache_info['data']) +def delete_cached_file(filename): + """Delete cached file if present. + + :param filename: filename to delete + """ + global _FILE_CACHE + + if filename in _FILE_CACHE: + del _FILE_CACHE[filename] + + def delete_if_exists(path, remove=os.unlink): """Delete a file, but ignore file not found error. @@ -99,13 +111,13 @@ def remove_path_on_error(path, remove=delete_if_exists): def file_open(*args, **kwargs): """Open file - see built-in file() documentation for more details + see built-in open() documentation for more details Note: The reason this is kept in a separate module is to easily be able to provide a stub module that doesn't alter system state at all (for unit tests) """ - return file(*args, **kwargs) + return open(*args, **kwargs) def write_to_tempfile(content, path=None, suffix='', prefix='tmp'): |