Skip to content
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

Correct warnings about invalid escape sequences #1070

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Correct warnings about invalid escape sequences #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a6a0fb
Get rid of warning about invalid escape sequence
vasole Mar 5, 2024
ef3dfa6
Get rid of invalid escape sequence message
vasole Mar 5, 2024
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
2 changes: 1 addition & 1 deletion PyMca5/PyMcaIO/MEDFile.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading