From 1d61bb3e94fb9f0c146bf402b5a0c69a326a3e92 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 11 Feb 2009 00:40:22 +0000 Subject: [PATCH] Revert last change. Hiding the exception isn't a good idea and the error shouldn't be OS-specific. --- deluge/core/core.py | 11 ++++------- deluge/ui/gtkui/gtkui.py | 7 ++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index b4d6d9435..9cec18618 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -30,14 +30,11 @@ import threading import pkg_resources import base64 -from deluge.log import LOG as log +from twisted.internet import reactor +from twisted.internet.task import LoopingCall +import twisted.web.client -try: - from twisted.internet import reactor - from twisted.internet.task import LoopingCall - import twisted.web.client -except ImportError: - log.error("You must install python-twisted") +from deluge.log import LOG as log try: import deluge.libtorrent as lt diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 7bf7abc6b..0aa4a56f8 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -26,11 +26,8 @@ from deluge.log import LOG as log # Install the twisted reactor -try: - from twisted.internet import gtk2reactor - reactor = gtk2reactor.install() -except ImportError: - log.error("You must install python-twisted") +from twisted.internet import gtk2reactor +reactor = gtk2reactor.install() import gobject import gettext