Skip to content

Internal cleanup in xarray.backends.file_manager #3061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shoyer merged 2 commits into from
Jul 2, 2019
Merged

Internal cleanup in xarray.backends.file_manager #3061

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b14b4a
Internal cleanup in xarray.backends.file_manager
shoyer Jun 30, 2019
dc1a566
Merge branch 'master' into file-manager-cleanup
shoyer Jun 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions xarray/backends/file_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ class CachingFileManager(FileManager):

"""

def __init__(self, opener, *args, **keywords):
def __init__(self, opener, *args, mode=_DEFAULT_MODE, kwargs=None,
lock=None, cache=None, ref_counts=None):
"""Initialize a FileManager.

The cache and ref_counts arguments exist solely to facilitate
Expand Down Expand Up @@ -102,17 +103,6 @@ def __init__(self, opener, *args, **keywords):
Optional dict to use for keeping track the number of references to
the same file.
"""
# TODO: replace with real keyword arguments when we drop Python 2
# support
mode = keywords.pop('mode', _DEFAULT_MODE)
kwargs = keywords.pop('kwargs', None)
lock = keywords.pop('lock', None)
cache = keywords.pop('cache', FILE_CACHE)
ref_counts = keywords.pop('ref_counts', REF_COUNTS)
if keywords:
raise TypeError('FileManager() got unexpected keyword arguments: '
'%s' % list(keywords))

self._opener = opener
self._args = args
self._mode = mode
Expand All @@ -122,12 +112,16 @@ def __init__(self, opener, *args, **keywords):
self._lock = threading.Lock() if self._default_lock else lock

# cache[self._key] stores the file associated with this object.
if cache is None:
cache = FILE_CACHE
self._cache = cache
self._key = self._make_key()

# ref_counts[self._key] stores the number of CachingFileManager objects
# in memory referencing this same file. We use this to know if we can
# close a file when the manager is deallocated.
if ref_counts is None:
ref_counts = REF_COUNTS
self._ref_counter = _RefCounter(ref_counts)
self._ref_counter.increment(self._key)

Expand Down