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

Remove remaining references to IM in the source code

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-10 15:46:41 +05:30
parent 126ea17b34
commit 828b684a2c
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/customize/builtins.py
View File

@ -1836,7 +1836,7 @@ if __name__ == '__main__':
ret = 0 ret = 0
for x in ('lxml', 'calibre.ebooks.BeautifulSoup', 'uuid', for x in ('lxml', 'calibre.ebooks.BeautifulSoup', 'uuid',
'calibre.utils.terminal', 'calibre.utils.magick', 'PIL', 'Image', 'calibre.utils.terminal', 'calibre.utils.img', 'PIL', 'Image',
'sqlite3', 'mechanize', 'httplib', 'xml', 'inspect', 'urllib', 'sqlite3', 'mechanize', 'httplib', 'xml', 'inspect', 'urllib',
'calibre.utils.date', 'calibre.utils.config', 'platform', 'calibre.utils.date', 'calibre.utils.config', 'platform',
'calibre.utils.zipfile', 'calibre.utils.formatter', 'calibre.utils.zipfile', 'calibre.utils.formatter',

7
src/calibre/gui2/__init__.py
View File

@ -1035,13 +1035,12 @@ def sanitize_env_vars():
is needed to prevent library conflicts when launching external utilities.''' is needed to prevent library conflicts when launching external utilities.'''
if islinux and isfrozen: if islinux and isfrozen:
env_vars = {'LD_LIBRARY_PATH':'/lib', 'QT_PLUGIN_PATH':'/lib/qt_plugins', 'MAGICK_CODER_MODULE_PATH':None, 'MAGICK_CODER_FILTER_PATH':None} env_vars = {'LD_LIBRARY_PATH':'/lib', 'QT_PLUGIN_PATH':'/lib/qt_plugins'}
elif iswindows: elif iswindows:
env_vars = {k:None for k in 'MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_MODULE_PATH MAGICK_FILTER_MODULE_PATH QT_PLUGIN_PATH'.split()} env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()}
elif isosx: elif isosx:
env_vars = {k:None for k in ( env_vars = {k:None for k in (
'FONTCONFIG_FILE FONTCONFIG_PATH MAGICK_CONFIGURE_PATH MAGICK_CODER_MODULE_PATH' 'FONTCONFIG_FILE FONTCONFIG_PATH QT_PLUGIN_PATH SSL_CERT_FILE').split()}
' MAGICK_FILTER_MODULE_PATH QT_PLUGIN_PATH SSL_CERT_FILE').split()}
else: else:
env_vars = {} env_vars = {}

3
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -4314,8 +4314,7 @@ class CatalogBuilder(object):
""" Create thumbnail of cover or return previously cached thumb. """ Create thumbnail of cover or return previously cached thumb.
Test thumb archive for currently cached cover. Return cached version, or create Test thumb archive for currently cached cover. Return cached version, or create
and cache new version. Uses calibre.utils.magick.draw to generate thumbnail from and cache new version.
cover.
Args: Args:
title (dict): book metadata title (dict): book metadata

8
src/calibre/test_build.py
View File

@ -204,13 +204,6 @@ def test_wpd():
wpd.uninit() wpd.uninit()
fprint('WPD OK!') fprint('WPD OK!')
def test_magick():
from calibre.utils.magick import create_canvas, qimage_to_magick
i = create_canvas(100, 100)
img = i.to_qimage()
i = qimage_to_magick(img)
fprint('magick OK!')
def test_tokenizer(): def test_tokenizer():
fprint('Testing tinycss tokenizer') fprint('Testing tinycss tokenizer')
from tinycss.tokenizer import c_tokenize_flat from tinycss.tokenizer import c_tokenize_flat
@ -301,7 +294,6 @@ def test():
test_qt() test_qt()
test_html5lib() test_html5lib()
test_regex() test_regex()
test_magick()
test_tokenizer() test_tokenizer()
test_netifaces() test_netifaces()
test_psutil() test_psutil()