Skip to content

Commit 2e18345

Browse files
committed
Fix line lengths
1 parent e8f8bed commit 2e18345

File tree

3 files changed

+118
-65
lines changed

3 files changed

+118
-65
lines changed

src/nxvalidate/scripts/nxinspect.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ def main():
2222
prog="nxinspect",
2323
description="Inspects and validates NeXus files.")
2424
parser.add_argument("-f", "--filename", nargs = 1,
25-
help="name of the NeXus file to be validated")
25+
help="name of the NeXus file to be validated")
2626
parser.add_argument("-p", "--path", nargs = 1,
27-
help = "path to group to be validated in the NeXus file")
27+
help = "path to group to be validated in the NeXus file")
2828
parser.add_argument("-a", "--application", nargs='?', const=True,
29-
help = "validate the NeXus file against its application definition")
29+
help = "validate the NeXus file against its application definition")
3030
parser.add_argument("-b", "--baseclass", nargs = 1,
31-
help = "name of the base class to be listed")
31+
help = "name of the base class to be listed")
3232
parser.add_argument("-i", "--info", action='store_true',
33-
help = "output info messages in addition to warnings and errors")
33+
help = "output info messages in addition to warnings and errors")
3434
parser.add_argument("-w", "--warning", action='store_true',
35-
help = "output warning and error messages (default)")
35+
help = "output warning and error messages (default)")
3636
parser.add_argument("-e", "--error", action='store_true',
37-
help = "output errors")
37+
help = "output errors")
3838
parser.add_argument('-v', '--version', action='version',
3939
version='%(prog)s v'+nxvalidate.__version__)
4040
args = parser.parse_args()

src/nxvalidate/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,8 @@ def merge_dicts(dict1, dict2):
325325
The updated dictionary.
326326
"""
327327
for key, value in dict2.items():
328-
if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict):
328+
if (key in dict1 and isinstance(dict1[key], dict)
329+
and isinstance(value, dict)):
329330
merge_dicts(dict1[key], value)
330331
else:
331332
dict1[key] = value

0 commit comments

Comments
 (0)