[Telepathy-commits] [telepathy-butterfly/master] Remove exception for old tp-python version

Olivier Le Thanh Duong olivier at lethanh.be
Fri Jan 23 18:38:19 PST 2009


Remove exception for old tp-python version
since we don't support it anymore

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 butterfly/connection.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/butterfly/connection.py b/butterfly/connection.py
index c6be838..f26a558 100644
--- a/butterfly/connection.py
+++ b/butterfly/connection.py
@@ -88,10 +88,7 @@ class ButterflyConnection(telepathy.server.Connection,
             self._channel_manager = ChannelManager(self)
 
             # Call parent initializers
-            try:
-                telepathy.server.Connection.__init__(self, 'msn', account, 'butterfly')
-            except TypeError: # handle old versions of tp-python
-                telepathy.server.Connection.__init__(self, 'msn', account)
+            telepathy.server.Connection.__init__(self, 'msn', account, 'butterfly')
             ButterflyPresence.__init__(self)
             ButterflySimplePresence.__init__(self)
             ButterflyAliasing.__init__(self)
-- 
1.5.6.5




More information about the Telepathy-commits mailing list