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

Pre-import calibre.utils.img when building manual as otherwise importing it can fail

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-17 19:22:29 +05:30
parent 49e45e052e
commit b966579e88
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

3
manual/conf.py
View File

@ -20,9 +20,10 @@ sys.path.append(base)
sys.path.insert(0, os.path.dirname(base)) sys.path.insert(0, os.path.dirname(base))
from setup import __appname__, __version__ from setup import __appname__, __version__
from calibre.utils.localization import localize_website_link from calibre.utils.localization import localize_website_link
import calibre.utils.img as cimg
import custom import custom
del sys.path[0] del sys.path[0]
custom custom, cimg
# General configuration # General configuration
# --------------------- # ---------------------

2
src/calibre/web/fetch/simple.py
View File

@ -25,7 +25,6 @@ from calibre.ebooks.BeautifulSoup import BeautifulSoup
from calibre.ebooks.chardet import xml_to_unicode from calibre.ebooks.chardet import xml_to_unicode
from calibre.utils.config import OptionParser from calibre.utils.config import OptionParser
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.utils.img import image_from_data, image_to_data
from calibre.utils.imghdr import what from calibre.utils.imghdr import what
from calibre.utils.logging import Log from calibre.utils.logging import Log
from calibre.web.fetch.utils import rescale_image from calibre.web.fetch.utils import rescale_image
@ -440,6 +439,7 @@ class RecursiveFetcher:
x.write(data) x.write(data)
tag['src'] = imgpath tag['src'] = imgpath
else: else:
from calibre.utils.img import image_from_data, image_to_data
try: try:
# Ensure image is valid # Ensure image is valid
img = image_from_data(data) img = image_from_data(data)