[LyX/master] Do not assume PIL module is installed
Juergen Spitzmueller <[email protected]> Wed, 03 Jun 2026 04:08:35 +0000
| Newsgroups | gmane.editors.lyx.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 3a974c55b1d37c73c436ea12ca7b655d62935f83 Author: Juergen Spitzmueller <[email protected]> Date: Wed Jun 3 06:08:11 2026 +0200 Do not assume PIL module is installed --- lib/configure.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index ac5f403c5f..87c205e312 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -1256,20 +1256,23 @@ def checkConverterEntries(): _, cmd = checkProg('a PNG -> EPS converter', ['magick', 'convert']) have_png2eps = False if cmd: - from PIL import Image - img = Image.new('RGB', (5, 5)) - img.save("mock.png", "PNG") try: - subprocess.check_call([cmd, "mock.png", "mock.eps"]) - removeFiles(['mock.eps', 'mock.png']) - rc_entry = r'\converter png eps "%s $$i[0] $$o" ""' - addToRC(rc_entry % cmd) - have_png2eps = True + from PIL import Image + img = Image.new('RGB', (5, 5)) + img.save("mock.png", "PNG") + try: + subprocess.check_call([cmd, "mock.png", "mock.eps"]) + removeFiles(['mock.eps', 'mock.png']) + rc_entry = r'\converter png eps "%s $$i[0] $$o" ""' + addToRC(rc_entry % cmd) + have_png2eps = True + except: + removeFiles(['mock.png']) + #needs empty record otherwise default converter will be issued + addToRC(r'''\converter png eps "" ""''') + logger.info('ImageMagick seems to ban conversions to EPS. Disabling direct PNG->EPS.') except: - removeFiles(['mock.png']) - #needs empty record otherwise default converter will be issued - addToRC(r'''\converter png eps "" ""''') - logger.info('ImageMagick seems to ban conversions to EPS. Disabling direct PNG->EPS.') + logger.info('PIL module missing. Cannot check for PNG->EPS converter.') if not have_png2eps: #try inkscape instead. -- lyx-cvs mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-cvs