data/convert-icon: Support Pillow in addition to PIL

chocolate-doom · Apr 24, 2017 · 429fa57 · 429fa57
1 parent fb7a43c
commit 429fa57
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/data/convert-icon b/data/convert-icon
@@ -23,8 +23,13 @@ import re
 try:
         import Image
 except ImportError:
-        print("WARNING: Could not update %s.  Please install the Python Imaging library." % sys.argv[2])
-        sys.exit(0)
+        try:
+                from PIL import Image
+        except ImportError:
+                print("WARNING: Could not update %s.  "
+                      "Please install the Python Imaging library or Pillow."
+                      % sys.argv[2])
+                sys.exit(0)
 
 
 def convert_image(filename, output_filename):