Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/collaboration
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-02-24 03:56:10 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-02-24 03:56:10 (GMT)
commitaed39bb17062c491cdeb3a1107f78ccaa9a95488 (patch)
tree4f91f7bc447e35b003a511b21f54c997d22c6603 /collaboration
parent84c5d8893c97421bd3ca39358c9e7888eac1e25a (diff)
don't trap import error
Diffstat (limited to 'collaboration')
-rw-r--r--collaboration/telepathyclient.py17
1 files changed, 6 insertions, 11 deletions
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])