From 1ca08ccf95f79494c1ac01326e73671a7a022f80 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Wed, 3 Sep 2014 16:59:05 +0100 Subject: [PATCH] [Python-Modernize] Replace im_self with __self__ --- deluge/core/rpcserver.py | 2 +- .../Notifications/deluge/plugins/notifications/common.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 361d7615c..8f5e25dac 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -413,7 +413,7 @@ class RPCServer(component.Component): """ for key, value in self.factory.methods.items(): - if value.im_self == obj: + if value.__self__ == obj: del self.factory.methods[key] def get_object_method(self, name): diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/common.py b/deluge/plugins/Notifications/deluge/plugins/notifications/common.py index 8bc72b961..d23eee875 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/common.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/common.py @@ -127,7 +127,7 @@ class CustomNotifications(object): log.error("The event \"%s\" is not known" % eventtype) return False if known_events[eventtype].__module__.startswith('deluge.event'): - if handler.im_self is self: + if handler.__self__ is self: return True log.error("You cannot register custom notification providers " "for built-in event types.")