From a6eb1d79ea3b2a86873ccb24eeacdf964bfd4f47 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 23 Apr 2019 10:46:58 +0530 Subject: [PATCH] py3: Replace useage of im_func --- src/calibre/devices/usbms/device.py | 2 +- src/calibre/web/feeds/news.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 5c5b28f2dc..6b73ffb788 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -212,7 +212,7 @@ class Device(DeviceConfig, DevicePlugin): def can_handle_windows(self, usbdevice, debug=False): from calibre.devices.interface import DevicePlugin - if self.can_handle.im_func is DevicePlugin.can_handle.im_func: + if self.can_handle.__func__ is DevicePlugin.can_handle.__func__: # No custom can_handle implementation return True # Delegate to the unix can_handle function, creating a unix like diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index 3509a53d52..146946bc5f 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -982,6 +982,7 @@ class BasicNewsRecipe(Recipe): script.extract() for attr in self.remove_attributes: for x in soup.findAll(attrs={attr:True}): + print(1111111111, x) del x[attr] for base in list(soup.findAll(['base', 'iframe', 'canvas', 'embed', 'command', 'datalist', 'video', 'audio'])): @@ -1117,7 +1118,7 @@ class BasicNewsRecipe(Recipe): def _fetch_article(self, url, dir_, f, a, num_of_feeds): br = self.browser - if self.get_browser.im_func is BasicNewsRecipe.get_browser.im_func: + if self.get_browser.__func__ is BasicNewsRecipe.get_browser.__func__: # We are using the default get_browser, which means no need to # clone br = BasicNewsRecipe.get_browser(self)