From 0de3e9a2337fe76f5522252a82c3b2d87ccbea9e Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sun, 22 Apr 2018 09:59:43 +0200
Subject: [PATCH] update handling

---
 hassio/exceptions.py  | 23 +++++++++++++++++++++
 hassio/utils/gdbus.py | 47 +++++++++----------------------------------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/hassio/exceptions.py b/hassio/exceptions.py
index f4d4bea61..236c5c889 100644
--- a/hassio/exceptions.py
+++ b/hassio/exceptions.py
@@ -1,5 +1,6 @@
 """Core Exceptions."""
 
+
 class HassioError(Exception):
     """Root exception."""
     pass
@@ -13,3 +14,25 @@ class HassioInternalError(HassioError):
 class HassioNotSupportedError(HassioError):
     """Function is not supported."""
     pass
+
+
+# utils/gdbus
+
+class DBusError(HassioError):
+    """DBus generic error."""
+    pass
+
+
+class DBusFatalError(DBusError):
+    """DBus call going wrong."""
+    pass
+
+
+class DBusReturnError(DBusError):
+    """DBus return error."""
+    pass
+
+
+class DBusParseError(DBusError):
+    """DBus parse error."""
+    pass
diff --git a/hassio/utils/gdbus.py b/hassio/utils/gdbus.py
index b78245525..8a82bde7d 100644
--- a/hassio/utils/gdbus.py
+++ b/hassio/utils/gdbus.py
@@ -4,6 +4,8 @@ import logging
 import shlex
 import xml.etree.ElementTree as ET
 
+from ..exceptions import DBusFatalError, DBusReturnError, DBusParseError
+
 _LOGGER = logging.getLogger(__name__)
 
 INTROSPECT = ("gdbus introspect --system --dest {bus} "
@@ -12,26 +14,6 @@ CALL = ("gdbus call --system --dest {bus} --object-path {inf} "
         "--method {inf}.{method} {args}")
 
 
-class DBusError(Exception):
-    """DBus generic error."""
-    pass
-
-
-class DBusFatalError(DBusError):
-    """DBus call going wrong."""
-    pass
-
-
-class DBusReturnError(DBusError):
-    """DBus return error."""
-    pass
-
-
-class DBusParseError(DBusError):
-    """DBus parse error."""
-    pass
-
-
 class DBus(object):
     """DBus handler."""
 
@@ -58,19 +40,15 @@ class DBus(object):
         ))
 
         # Ask data
-        try:
-            data = await self._send(command)
-        except DBusError:
-            _LOGGER.error(
-                "DBus fails connect to %s", self.object_path)
-            raise
+        _LOGGER.info("Introspect %s no %s", self.bus_name, self.object_path)
+        data = await self._send(command)
 
         # Parse XML
         try:
             xml = ET.fromstring(data)
         except ET.ParseError as err:
-            _LOGGER.error("Can't parse introspect data: %s", err)
-            raise DBusParseError() from None
+            raise DBusParseError(
+                f"Can't parse introspect data: {err!s}") from None
 
         # Read available methods
         for interface in xml.findall("/node/interface"):
@@ -94,12 +72,8 @@ class DBus(object):
         ))
 
         # Run command
-        try:
-            data = await self._send(command)
-        except DBusError:
-            _LOGGER.error(
-                "DBus fails with %s on %s", method, self.object_path)
-            raise
+        _LOGGER.info("Call %s no %s", method, interface)
+        data = await self._send(command)
 
         # Parse and return data
         return self._gvariant(data)
@@ -117,12 +91,11 @@ class DBus(object):
 
             data, _ = await proc.communicate()
         except OSError as err:
-            _LOGGER.error("DBus fatal error: %s", err)
-            raise DBusFatalError() from None
+            raise DBusFatalError(f"DBus fatal error: {err!s}") from None
 
         # Success?
         if proc.returncode != 0:
-            raise DBusReturnError()
+            raise DBusReturnError(f"DBus return error: {data!s}")
 
         # End
         return data.decode()