diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py index dd741c5978bdade13d10ad26cdf6eae07868c019..77f965e1eb4912f8c1cdfc3d410e63860d117bb6 100644 --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -39,7 +39,6 @@ except ImportError: pass import dbus - import dbus.service import dbus.glib supported = True # does user have D-Bus bindings? except ImportError: diff --git a/src/disco.py b/src/disco.py index 5abc0818b948b4fbcee00d52eca01d6e02af82d8..9dd135d3fe6efff849d53bcfd7d1f1df04f827bf 100644 --- a/src/disco.py +++ b/src/disco.py @@ -45,7 +45,7 @@ # There are more methods, of course, but this is a basic set. import os -import inspect +import types import weakref import gobject import gtk @@ -203,7 +203,7 @@ def __init__(self, cb, userargs = (), remove = None, removeargs = ()): self.userargs = userargs self.remove = remove self.removeargs = removeargs - if inspect.ismethod(cb): + if isinstance(cb, types.MethodType): self.meth_self = weakref.ref(cb.im_self, self._remove) self.meth_name = cb.func_name elif callable(cb): diff --git a/src/notify.py b/src/notify.py index 0d5a4bfb889e48be8d2a1a83fb09a7a9443d39bf..0d389039b02e52f62c4b190feccd709f4a91cd99 100644 --- a/src/notify.py +++ b/src/notify.py @@ -40,7 +40,6 @@ if dbus_support.supported: import dbus import dbus.glib - import dbus.service USER_HAS_PYNOTIFY = True # user has pynotify module