diff --git a/deluge/common.py b/deluge/common.py index 6f5a825c1..6dc03dcf4 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -30,7 +30,6 @@ try: import dbus bus = dbus.SessionBus() dbus_fileman = bus.get_object("org.freedesktop.FileManager1", "/org/freedesktop/FileManager1") - except: dbus_fileman = None diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 5fb0f3185..a766bc2df 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -15,9 +15,7 @@ import warnings import gobject import gtk from twisted.internet import gtk2reactor - -# Install the twisted reactor -reactor = gtk2reactor.install() +reactor = gtk2reactor.install() # Install twisted reactor, before any other modules import reactor. import deluge.common import deluge.component as component diff --git a/docs/source/conf.py b/docs/source/conf.py index 28d064006..5a1502d90 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -21,9 +21,6 @@ try: except ImportError: get_version = None -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' -on_travis = os.environ.get('TRAVIS', None) == 'true' - # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it # absolute, like shown here.