commit 6c5c62c349b2ce6c362a9c7107a82e8bf73c89fd
Author: Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Thu May 12 08:48:16 2016 -0700
Commit: Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Thu May 12 08:52:44 2016 -0700
textscreen/fonts: Support Pillow in addition to PIL
---
textscreen/fonts/convert-font | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/textscreen/fonts/convert-font b/textscreen/fonts/convert-font
index 15b70147..641db92c 100755
--- a/textscreen/fonts/convert-font
+++ b/textscreen/fonts/convert-font
@@ -26,9 +26,13 @@ GRID_ROWS = 16
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):