diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 9a345500f8..8711dad7e6 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1836,7 +1836,7 @@ if __name__ == '__main__': ret = 0 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', 'calibre.utils.date', 'calibre.utils.config', 'platform', 'calibre.utils.zipfile', 'calibre.utils.formatter', diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 4f35f1c805..338a4f0ad3 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -1035,13 +1035,12 @@ def sanitize_env_vars(): is needed to prevent library conflicts when launching external utilities.''' 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: - 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: env_vars = {k:None for k in ( - 'FONTCONFIG_FILE FONTCONFIG_PATH MAGICK_CONFIGURE_PATH MAGICK_CODER_MODULE_PATH' - ' MAGICK_FILTER_MODULE_PATH QT_PLUGIN_PATH SSL_CERT_FILE').split()} + 'FONTCONFIG_FILE FONTCONFIG_PATH QT_PLUGIN_PATH SSL_CERT_FILE').split()} else: env_vars = {} diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index 195c5eaaca..2738f78b75 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -4314,8 +4314,7 @@ class CatalogBuilder(object): """ Create thumbnail of cover or return previously cached thumb. 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 - cover. + and cache new version. Args: title (dict): book metadata diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py index e39dfdf49c..51bdf93cad 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py @@ -204,13 +204,6 @@ def test_wpd(): wpd.uninit() 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(): fprint('Testing tinycss tokenizer') from tinycss.tokenizer import c_tokenize_flat @@ -301,7 +294,6 @@ def test(): test_qt() test_html5lib() test_regex() - test_magick() test_tokenizer() test_netifaces() test_psutil()