From aed39bb17062c491cdeb3a1107f78ccaa9a95488 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 24 Feb 2011 03:56:10 +0000
Subject: don't trap import error

---
diff --git a/collaboration/telepathyclient.py b/collaboration/telepathyclient.py
index f3e8578..e00f053 100644
--- a/collaboration/telepathyclient.py
+++ b/collaboration/telepathyclient.py
@@ -18,15 +18,12 @@ import logging
 
 import dbus
 from dbus import PROPERTIES_IFACE
-try:
-    from telepathy.interfaces import CLIENT, \
-                                     CLIENT_APPROVER, \
-                                     CLIENT_HANDLER, \
-                                     CLIENT_INTERFACE_REQUESTS
-    from telepathy.server import DBusProperties
-    TELEPATHY_AVAILABLE = True
-except ImportError:
-    TELEPATHY_AVAILABLE = False
+
+from telepathy.interfaces import CLIENT, \
+    CLIENT_APPROVER, \
+    CLIENT_HANDLER, \
+    CLIENT_INTERFACE_REQUESTS
+from telepathy.server import DBusProperties
 
 import dispatch
 
@@ -40,8 +37,6 @@ _instance = None
 class TelepathyClient(dbus.service.Object, DBusProperties):
 
     def __init__(self):
-        if not TELEPATHY_AVAILABLE:
-            return None
         self._interfaces = set([CLIENT, CLIENT_HANDLER,
                                 CLIENT_INTERFACE_REQUESTS, PROPERTIES_IFACE,
                                 CLIENT_APPROVER])
--
cgit v0.9.1