From 10f2faf3ed55d265478164facb9b43c6c29b6865 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Tue, 8 Mar 2016 01:04:11 -0800 Subject: [PATCH] Provide a more general error check to catch #1753 --- PIL/Image.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PIL/Image.py b/PIL/Image.py index 6d0fe4fc3..c81727c96 100644 --- a/PIL/Image.py +++ b/PIL/Image.py @@ -82,16 +82,20 @@ except ImportError as v: ) elif str(v).startswith("The _imaging extension"): warnings.warn(str(v), RuntimeWarning) - elif "Symbol not found: _PyUnicodeUCS2_FromString" in str(v): + elif "Symbol not found: _PyUnicodeUCS2_" in str(v): + # should match _PyUnicodeUCS2_FromString and + # _PyUnicodeUCS2_AsLatin1String warnings.warn( "The _imaging extension was built for Python with UCS2 support; " - "recompile PIL or build Python --without-wide-unicode. ", + "recompile Pillow or build Python --without-wide-unicode. ", RuntimeWarning ) - elif "Symbol not found: _PyUnicodeUCS4_FromString" in str(v): + elif "Symbol not found: _PyUnicodeUCS4_" in str(v): + # should match _PyUnicodeUCS4_FromString and + # _PyUnicodeUCS4_AsLatin1String warnings.warn( "The _imaging extension was built for Python with UCS4 support; " - "recompile PIL or build Python --with-wide-unicode. ", + "recompile Pillow or build Python --with-wide-unicode. ", RuntimeWarning ) # Fail here anyway. Don't let people run with a mostly broken Pillow.