diff options
author | Simon Schampijer <simon@schampijer.de> | 2009-01-16 13:27:57 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2009-01-16 13:27:57 (GMT) |
commit | 9011a49e494e87addd37d0bb7bc0b213f3883cd9 (patch) | |
tree | 22e05dcaaca41b6258c35047c6e9b57670c031a5 | |
parent | 7a30d9b504090ecc3ed1319245bb0240914494d8 (diff) |
pylint fixesupstream-git
detected an error in the restart jabber
-rw-r--r-- | extensions/cpsection/network/model.py | 5 | ||||
-rw-r--r-- | extensions/cpsection/network/view.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py index bfb9686..1b67942 100644 --- a/extensions/cpsection/network/model.py +++ b/extensions/cpsection/network/model.py @@ -45,7 +45,7 @@ def set_jabber(server): client = gconf.client_get_default() client.set_string('/desktop/sugar/collaboration/jabber_server', server) - self._restart_jabber() + _restart_jabber() return 0 def _restart_jabber(): @@ -58,7 +58,8 @@ def _restart_jabber(): _PS_PATH = "/org/laptop/Sugar/Presence" bus = dbus.SessionBus() try: - ps = dbus.Interface(bus.get_object(_PS_SERVICE, _PS_PATH), _PS_INTERFACE) + ps = dbus.Interface(bus.get_object(_PS_SERVICE, _PS_PATH), + _PS_INTERFACE) except dbus.DBusException: raise ReadError('%s service not available', _PS_SERVICE) ps.RestartServerConnection() diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py index 31a4f72..d0bd755 100644 --- a/extensions/cpsection/network/view.py +++ b/extensions/cpsection/network/view.py @@ -225,7 +225,7 @@ class Network(SectionView): return try: self._model.set_jabber(widget.get_text()) - except ReadError, detail: + except Exception, detail: self._jabber_alert.props.msg = detail self._jabber_valid = False self._jabber_alert.show() |