From 7d357dfe5a428c030e85d95aaa16875f86671495 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Wed, 30 Nov 2005 14:48:58 +0000 Subject: [PATCH] fix names of exception, fix docstring, fix strings --- src/gajim-remote.py | 10 +++++----- src/remote_control.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gajim-remote.py b/src/gajim-remote.py index cfb1e393a..d990dc9f2 100755 --- a/src/gajim-remote.py +++ b/src/gajim-remote.py @@ -44,25 +44,25 @@ def send_error(error_message): sys.exit(1) class ServiceNotAvailable(Exception): - ''' This exception indicates that there is no session daemon ''' + '''This exception is raised when we cannot use Gajim remotely''' def __init__(self): Exception.__init__(self) def __str__(self): return _('Service not available: Gajim is not running, or remote_control is False') -class DbusModuleMissing(Exception): - ''' This exception indicates that there is no session daemon ''' +class DbusNotSupported(Exception): + '''D-Bus is not installed or python bindings are missing''' def __init__(self): Exception.__init__(self) def __str__(self): - return _('D-Bus python module is missing') + return _('D-Bus is not present on this machine or python module is missing') try: import dbus except: - raise DbusModuleMissing + raise DbusNotSupported _version = getattr(dbus, 'version', (0, 20, 0)) if _version[1] >= 41: diff --git a/src/remote_control.py b/src/remote_control.py index 14e705caf..4b8ebf375 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -515,7 +515,7 @@ class SignalObject(DbusPrototype): add_contact = method(INTERFACE)(add_contact) class SessionBusNotPresent(Exception): - ''' This exception indicates that there is no session daemon ''' + '''This exception indicates that there is no session daemon''' def __init__(self): Exception.__init__(self) @@ -523,9 +523,9 @@ class SessionBusNotPresent(Exception): return _('Session bus is not available') class DbusNotSupported(Exception): - ''' D-Bus is not installed or python bindings are missing ''' + '''D-Bus is not installed or python bindings are missing''' def __init__(self): Exception.__init__(self) def __str__(self): - return _('D-Bus is not present on this machine') + return _('D-Bus is not present on this machine or python module is missing')