From 6e27d70517bcdfd17d97eea2e820ac47924e8df9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 31 Jul 2019 15:54:45 +1000 Subject: [PATCH] wacom: de-duplicate an opcode check we don't need the same-ish check twice, we can just pop our non-list into a list an go from there. Signed-off-by: Peter Hutterer --- tuhi/wacom.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tuhi/wacom.py b/tuhi/wacom.py index 360d2ea..084fcc9 100644 --- a/tuhi/wacom.py +++ b/tuhi/wacom.py @@ -501,12 +501,11 @@ class WacomProtocolLowLevelComm(GObject.Object): # logger.debug(f'received {data.opcode:02x} / {data.length:02x} / {b2hex(bytes(data))}') - if isinstance(expected_opcode, list): - if data.opcode not in expected_opcode: - raise WacomException(f'unexpected opcode: {data.opcode:02x}') - else: - if data.opcode != expected_opcode: - raise WacomException(f'unexpected opcode: {data.opcode:02x}') + if not isinstance(expected_opcode, list): + expected_opcode = [expected_opcode] + + if data.opcode not in expected_opcode: + raise WacomException(f'unexpected opcode: {data.opcode:02x}') return data