Merge pull request #9 from wmetcalf/master

Fix Screenshots to work with Pillow versions newer than 6.1
kevoreilly · Jan 8, 2020 · 7411a35 · 7411a35
2 parents 8617ee9 + ce80166
commit 7411a35
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/analyzer/windows/lib/api/screenshot.py b/analyzer/windows/lib/api/screenshot.py
@@ -19,10 +19,14 @@
     from PIL import ImageGrab
     log.debug("Importing 'PIL.ImageDraw'")
     from PIL import ImageDraw
-    from PIL import PILLOW_VERSION
+    try:
+        from PIL import __version__
+    except ImportError:
+        from PIL import PILLOW_VERSION as __version__
     HAVE_PIL = True
-    if int(PILLOW_VERSION[0]) < 5:
+    if int(__version__[0]) < 5:
         log.info("Please upgrade Pillow to >= 5.4.1 for best performance")
+
 except Exception as e:
     HAVE_PIL = False
     log.error(e)