summaryrefslogtreecommitdiff
path: root/dbus/exceptions.py
diff options
context:
space:
mode:
Diffstat (limited to 'dbus/exceptions.py')
-rw-r--r--dbus/exceptions.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/dbus/exceptions.py b/dbus/exceptions.py
index 8d84a29..5283369 100644
--- a/dbus/exceptions.py
+++ b/dbus/exceptions.py
@@ -27,6 +27,7 @@ __all__ = ('DBusException', 'MissingErrorHandlerException',
'IntrospectionParserException', 'UnknownMethodException',
'NameExistsException')
+
class DBusException(Exception):
include_traceback = False
@@ -57,7 +58,9 @@ class DBusException(Exception):
def get_dbus_message(self):
s = Exception.__str__(self)
- return s.decode('utf-8', 'replace')
+ if isinstance(s, bytes):
+ return s.decode('utf-8', 'replace')
+ return s
def get_dbus_name(self):
return self._dbus_error_name