shithub: choc

Info  •  Files  •  Log  •  Branches

textscreen/fonts: Support Pillow in addition to PIL

--- a/textscreen/fonts/convert-font

+++ b/textscreen/fonts/convert-font

@@ -26,9 +26,13 @@

 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[3])

+        sys.exit(0)

 def generate_font_data(filename):