Skip to content

Release file locks on close failure and clarify path errors #265

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
rayosborn merged 2 commits into from
Jun 4, 2026
Merged

Release file locks on close failure and clarify path errors #265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e28dfb
Include the offending key in NXgroup path-error messages
rayosborn Jun 4, 2026
212cbbb
Release file lock even if h5py close raises
rayosborn Jun 4, 2026
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
22 changes: 13 additions & 9 deletions src/nexusformat/nexus/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,11 @@ def __enter__(self):

def __exit__(self, *args):
"""Close the NeXus file and, if necessary, release the lock."""
if self._with_count == 1:
self.close()
self._with_count -= 1
try:
if self._with_count == 1:
self.close()
finally:
self._with_count -= 1

def __del__(self):
"""Close the file and delete the NXFile instance."""
Expand Down Expand Up @@ -721,9 +723,11 @@ def close(self):
-----
The file modification time of the root object is updated.
"""
if self.is_open():
self._file.close()
self.release_lock()
try:
if self.is_open():
self._file.close()
finally:
self.release_lock()
try:
self._root._mtime = self.mtime
except Exception:
Expand Down Expand Up @@ -4886,7 +4890,7 @@ def __getitem__(self, key):
try:
path = PurePath(str(key))
except TypeError:
raise NeXusError("Invalid index")
raise NeXusError(f"'{key}' is an invalid index")
if path.is_absolute():
node = self.nxroot
path = path.relative_to('/')
Expand All @@ -4896,7 +4900,7 @@ def __getitem__(self, key):
try:
node = node.entries[name]
except KeyError:
raise NeXusError("Invalid path")
raise NeXusError(f"'{path}' is an invalid path")
return node

def __setitem__(self, key, value):
Expand Down Expand Up @@ -5007,7 +5011,7 @@ def __delitem__(self, key):
if name in group:
group = group[name]
else:
raise NeXusError("Invalid path")
raise NeXusError(f"'{key}' is an invalid path")
if key not in group:
raise NeXusError("'"+key+"' not in "+group.nxpath)
elif group[key].is_linked():
Expand Down
Loading