Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2013-01-02 02:18:36 +0400
committerYann Leboulanger <asterix@lagaule.org>2013-01-02 02:18:36 +0400
commitd27591076fa0ec8ab046aa805581e88e5c612585 (patch)
treedb3e87a5d18de2d8bf5f22f3b3542cda5af8bd20 /src/notify.py
parent069bddbbcb4d2ba2a4f9c1727e12963ce8e80eab (diff)
fix exception handling
Diffstat (limited to 'src/notify.py')
-rw-r--r--src/notify.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/notify.py b/src/notify.py
index f2b8d5b11..a9ca09216 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -91,10 +91,10 @@ text=None, timeout=-1):
DesktopNotification(event_type, jid, account, msg_type,
path_to_image, title, GObject.markup_escape_text(text), timeout)
return # sucessfully did D-Bus Notification procedure!
- except dbus.DBusException, e:
+ except dbus.DBusException as e:
# Connection to D-Bus failed
gajim.log.debug(str(e))
- except TypeError, e:
+ except TypeError as e:
# This means that we sent the message incorrectly
gajim.log.debug(str(e))
@@ -129,7 +129,7 @@ text=None, timeout=-1):
try:
notification.show()
return
- except GObject.GError, e:
+ except GObject.GError as e:
# Connection to notification-daemon failed, see #2893
gajim.log.debug(str(e))
@@ -397,7 +397,7 @@ class DesktopNotification:
dbus.UInt32(self.timeout*1000),
reply_handler=self.attach_by_id,
error_handler=self.notify_another_way)
- except Exception, e:
+ except Exception as e:
self.notify_another_way(e)
else:
try:
@@ -412,7 +412,7 @@ class DesktopNotification:
dbus.UInt32(self.timeout*1000),
reply_handler=self.attach_by_id,
error_handler=self.notify_another_way)
- except Exception, e:
+ except Exception as e:
self.notify_another_way(e)
def attach_by_id(self, id_):