Skip to content

Commit

Permalink
Merge pull request #1070 from vasole/debian
Browse files Browse the repository at this point in the history
Correct warnings about invalid escape sequences
  • Loading branch information
vasole authored Mar 11, 2024
2 parents 97df07e + ef3dfa6 commit 56eff8b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion PyMca5/PyMcaIO/MEDFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def mca_read_file(self, fname):
x, sroi, item = tag.split('_')
iroi = int(sroi)
if item == "label":
labels = str2str(val, delim='\&')
labels = str2str(val, delim=r'&')
if labels[-1] == '':
labels = labels[:-1]
_roi_n[iroi] = labels
Expand Down
8 changes: 4 additions & 4 deletions PyMca5/PyMcaIO/NexusUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# The PyMca X-Ray Fluorescence Toolkit
#
# Copyright (c) 2019 European Synchrotron Radiation Facility
# Copyright (c) 2019-2024 European Synchrotron Radiation Facility
#
# This file is part of the PyMca X-ray Fluorescence Toolkit developed at
# the ESRF by the Software group.
Expand Down Expand Up @@ -199,7 +199,7 @@ def isNxClass(h5group, *classes):
Nexus class of existing h5py.Group (None when no Nexus instance)
:param h5py.Group h5group:
:param \*classes: list(str) of Nexus classes
:param *classes: list(str) of Nexus classes
:returns bool:
"""
return nxClass(h5group) in classes
Expand All @@ -208,7 +208,7 @@ def isNxClass(h5group, *classes):
def raiseIsNxClass(h5group, *classes):
"""
:param h5py.Group h5group:
:param \*classes: list(str) of Nexus classes
:param *classes: list(str) of Nexus classes
:raises RuntimeError:
"""
if isNxClass(h5group, *classes):
Expand All @@ -218,7 +218,7 @@ def raiseIsNxClass(h5group, *classes):
def raiseIsNotNxClass(h5group, *classes):
"""
:param h5py.Group h5group:
:param \*classes: list(str) of Nexus classes
:param *classes: list(str) of Nexus classes
:raises RuntimeError:
"""
if not isNxClass(h5group, *classes):
Expand Down

0 comments on commit 56eff8b

Please sign in to comment.