Attachment 675900 Details for Bug 893781 – Change imports of PIL Library so they'll work with pillow

[patch] Change imports of PIL Library so they'll work with pillow

PySolFC-pillow.patch (text/plain), 1.33 KB, created by Toshio Ernie Kuratomi on 2013-01-09 22:46:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2013-01-09 22:46:52 UTC

Size: 1.33 KB

patch

obsolete

>Index: PySolFC-2.0/pysollib/mfxutil.py
>===================================================================
>--- PySolFC-2.0.orig/pysollib/mfxutil.py
>+++ PySolFC-2.0/pysollib/mfxutil.py
>@@ -41,18 +41,18 @@ from settings import PACKAGE, TOOLKIT
> Image = ImageTk = ImageOps = None
> if TOOLKIT == 'tk':
>     try: # PIL
>-        import Image
>-        import ImageTk
>-        import ImageOps
>+        from PIL import Image
>+        from PIL import ImageTk
>+        from PIL import ImageOps
>     except ImportError:
>         Image = None
>     else:
>         # for py2exe
>-        import GifImagePlugin
>-        import PngImagePlugin
>-        import JpegImagePlugin
>-        import BmpImagePlugin
>-        import PpmImagePlugin
>+        from PIL import GifImagePlugin
>+        from PIL import PngImagePlugin
>+        from PIL import JpegImagePlugin
>+        from PIL import BmpImagePlugin
>+        from PIL import PpmImagePlugin
>         Image._initialized = 2
> 
> 
>Index: PySolFC-2.0/scripts/cardset_viewer.py
>===================================================================
>--- PySolFC-2.0.orig/scripts/cardset_viewer.py
>+++ PySolFC-2.0/scripts/cardset_viewer.py
>@@ -7,7 +7,7 @@ from glob import glob
> from math import sqrt, sin, cos, pi
> from Tkinter import *
> try:
>-    import Image, ImageTk
>+    from PIL import Image, ImageTk
> except ImportError:
>     Image = None
>

Actions: View | Diff

Attachments on bug 893781: 675886 | 675900