diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index 2e9dde1c61..d38f5b8c36 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -365,7 +365,7 @@ Install as normal using installer at http://www.lfd.uci.edu/~gohlke/pythonlibs/ Test it on the target system with -calibre-debug -c "import _imaging, _imagingmath, _imagingft, _imagingcms" +calibre-debug -c "from PIL import _imaging, _imagingmath, _imagingft, _imagingcms" kdewin32-msvc diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py index add1b7d6cc..0c5b430017 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py @@ -74,7 +74,8 @@ def test_imaging(): print ('ImageMagick OK!') else: raise RuntimeError('ImageMagick choked!') - from PIL import Image + from PIL import Image, _imaging, _imagingmath, _imagingft, _imagingcms + _imaging, _imagingmath, _imagingft, _imagingcms i = Image.open(cStringIO.StringIO(data)) if i.size < (20, 20): raise RuntimeError('PIL choked!')