From 4b31945e1dd869a14d5b54a9423fec979cf2bdbf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 12 Sep 2018 11:00:23 +1000 Subject: [PATCH] tools: change the exception to just RatbagdUnavailable ratbag-command has an 'except RatbagdDBusUnavailable' line despite that class never being defined. That's ok because we'll never throw it in this case but it's still confusing (to flake8). So let's change the class name to something more generic and define it in ratbagc.py Signed-off-by: Peter Hutterer --- tools/ratbagc.py.in | 5 +++++ tools/ratbagctl.in | 6 +++--- tools/ratbagd.py | 10 +++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/ratbagc.py.in b/tools/ratbagc.py.in index 383f4181..7c26df3a 100644 --- a/tools/ratbagc.py.in +++ b/tools/ratbagc.py.in @@ -80,6 +80,11 @@ class RatbagErrorCode(metaclass=MetaRatbag): RATBAG_ERROR_IMPLEMENTATION = libratbag.RATBAG_ERROR_IMPLEMENTATION +class RatbagdUnavailable(Exception): + """Signals DBus is unavailable or the ratbagd daemon is not available.""" + pass + + class RatbagError(Exception): """A common base exception to catch any ratbag exception.""" pass diff --git a/tools/ratbagctl.in b/tools/ratbagctl.in index e1cddd9d..2b317980 100755 --- a/tools/ratbagctl.in +++ b/tools/ratbagctl.in @@ -28,7 +28,7 @@ import sys import argparse import re -from ratbagd import Ratbagd, RatbagdDevice, RatbagdProfile, RatbagdMacro, RatbagdResolution, RatbagdButton, RatbagdLed, RatbagdDBusUnavailable, RatbagError, RatbagErrorCode, RatbagErrorCapability # NOQA +from ratbagd import Ratbagd, RatbagdDevice, RatbagdProfile, RatbagdMacro, RatbagdResolution, RatbagdButton, RatbagdLed, RatbagdUnavailable, RatbagError, RatbagErrorCode, RatbagErrorCapability # NOQA button_specials_strmap = { @@ -1520,8 +1520,8 @@ def open_ratbagd(ratbagd_process=None, verbose=0): try: r = Ratbagd() r.verbose = verbose - except RatbagdDBusUnavailable: - print("Unable to connect to ratbagd over dbus") + except RatbagdUnavailable: + print("Unable to connect to ratbagd") return None if ratbagd_process is not None: diff --git a/tools/ratbagd.py b/tools/ratbagd.py index 54bbe467..a6e8d6b8 100644 --- a/tools/ratbagd.py +++ b/tools/ratbagd.py @@ -61,7 +61,7 @@ class RatbagErrorCode(IntEnum): RATBAG_ERROR_IMPLEMENTATION = -1004 -class RatbagdDBusUnavailable(Exception): +class RatbagdUnavailable(Exception): """Signals DBus is unavailable or the ratbagd daemon is not available.""" pass @@ -121,7 +121,7 @@ class _RatbagdDBus(GObject.GObject): try: _RatbagdDBus._dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None) except GLib.Error as e: - raise RatbagdDBusUnavailable(e.message) + raise RatbagdUnavailable(e.message) ratbag1 = "org.freedesktop.ratbag1" if os.environ.get('RATBAGCTL_DEVEL'): @@ -142,10 +142,10 @@ class _RatbagdDBus(GObject.GObject): self._interface, None) except GLib.Error as e: - raise RatbagdDBusUnavailable(e.message) + raise RatbagdUnavailable(e.message) if self._proxy.get_name_owner() is None: - raise RatbagdDBusUnavailable("No one currently owns {}".format(ratbag1)) + raise RatbagdUnavailable("No one currently owns {}".format(ratbag1)) self._proxy.connect("g-properties-changed", self._on_properties_changed) @@ -270,7 +270,7 @@ class Ratbagd(_RatbagdDBus): through ratbagd; actual interaction with the devices is via the RatbagdDevice, RatbagdProfile, RatbagdResolution and RatbagdButton objects. - Throws RatbagdDBusUnavailable when the DBus service is not available. + Throws RatbagdUnavailable when the DBus service is not available. """ __gsignals__ = {