diff --git a/tools/ratbagc.py.in b/tools/ratbagc.py.in index b47e7dbc..c0b4f046 100644 --- a/tools/ratbagc.py.in +++ b/tools/ratbagc.py.in @@ -216,11 +216,11 @@ class Ratbagd(object): def get_capabilities(type, object): capabilities = [] for k in libratbag.__dict__.keys(): - if k.startswith("RATBAG_{}_CAP_".format(type.upper())) and "CAP_NONE" not in k: - cap = getattr(libratbag, k) - func = getattr(libratbag, "ratbag_{}_has_capability".format(type.lower())) - if func(object, cap): - capabilities.append(cap) + if k.startswith("RATBAG_{}_CAP_".format(type.upper())) and "CAP_NONE" not in k: + cap = getattr(libratbag, k) + func = getattr(libratbag, "ratbag_{}_has_capability".format(type.lower())) + if func(object, cap): + capabilities.append(cap) return capabilities diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in index e06e5461..01bf6180 100755 --- a/tools/ratbagctl.test.in +++ b/tools/ratbagctl.test.in @@ -81,9 +81,9 @@ class TestRatbagCtl(unittest.TestCase): cmd.func(ratbagd, cmd) except SystemExit as e: returncode = e.code - except AttributeError as e: + except AttributeError: returncode = 2 - except argparse.ArgumentTypeError as e: + except argparse.ArgumentTypeError: returncode = 2 output = sys.stdout.getvalue() error = sys.stderr.getvalue() diff --git a/tools/toolbox.py b/tools/toolbox.py index 8bb3c8dc..c486cdcf 100644 --- a/tools/toolbox.py +++ b/tools/toolbox.py @@ -25,7 +25,6 @@ import imp import os -import shutil import subprocess import sys @@ -112,7 +111,7 @@ def sync_dbus(): ratbagctl = import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH) -from ratbagctl import open_ratbagd, get_parser, RatbagError, RatbagErrorCapability +from ratbagctl import open_ratbagd, get_parser, RatbagError, RatbagErrorCapability # NOQA __all__ = [ RATBAGCTL_NAME,