Skip to content

Commit 970734e

Browse files
bors[bot]maribu
andauthored
Merge #19750
19750: dist/tools/usb-serial: Fix handling of None while quoting r=aabadie a=maribu ### Contribution description This fixes: Traceback (most recent call last): File "/home/maribu/Repos/software/RIOT/master/dist/tools/usb-serial/ttys.py", line 259, in <module> print_ttys(sys.argv) File "/home/maribu/Repos/software/RIOT/master/dist/tools/usb-serial/ttys.py", line 255, in print_ttys print_results(args, ttys) File "/home/maribu/Repos/software/RIOT/master/dist/tools/usb-serial/ttys.py", line 189, in print_results if item.rfind(args.format_sep) >= 0: ^^^^^^^^^^ AttributeError: 'NoneType' object has no attribute 'rfind' Which occurs while testing whether a string requires special quoting if an attribute is None. Co-authored-by: Marian Buschsieweke <[email protected]>
2 parents 561e193 + 6192c62 commit 970734e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

dist/tools/usb-serial/ttys.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def print_results(args, ttys):
186186
line = ""
187187
for fmt in args.format:
188188
item = tty[fmt]
189-
if item.rfind(args.format_sep) >= 0:
189+
if item is not None and item.rfind(args.format_sep) >= 0:
190190
# item contains separator --> quote it
191191
# using json.dumps to also escape quotation chars and other
192192
# unsafe stuff

0 commit comments

Comments
 (0)