Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Replace useage of im_func

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-23 10:46:58 +05:30
parent f4cf168a72
commit a6eb1d79ea
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/usbms/device.py
View File

@ -212,7 +212,7 @@ class Device(DeviceConfig, DevicePlugin):
def can_handle_windows(self, usbdevice, debug=False): def can_handle_windows(self, usbdevice, debug=False):
from calibre.devices.interface import DevicePlugin 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 # No custom can_handle implementation
return True return True
# Delegate to the unix can_handle function, creating a unix like # Delegate to the unix can_handle function, creating a unix like

3
src/calibre/web/feeds/news.py
View File

@ -982,6 +982,7 @@ class BasicNewsRecipe(Recipe):
script.extract() script.extract()
for attr in self.remove_attributes: for attr in self.remove_attributes:
for x in soup.findAll(attrs={attr:True}): for x in soup.findAll(attrs={attr:True}):
print(1111111111, x)
del x[attr] del x[attr]
for base in list(soup.findAll(['base', 'iframe', 'canvas', 'embed', for base in list(soup.findAll(['base', 'iframe', 'canvas', 'embed',
'command', 'datalist', 'video', 'audio'])): 'command', 'datalist', 'video', 'audio'])):
@ -1117,7 +1118,7 @@ class BasicNewsRecipe(Recipe):
def _fetch_article(self, url, dir_, f, a, num_of_feeds): def _fetch_article(self, url, dir_, f, a, num_of_feeds):
br = self.browser 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 # We are using the default get_browser, which means no need to
# clone # clone
br = BasicNewsRecipe.get_browser(self) br = BasicNewsRecipe.get_browser(self)