Attachment 678529 Details for Bug 895290 – Patch to use the form of import of PIL that is pillow compatible

[patch] Patch to use the form of import of PIL that is pillow compatible

nml-pillow.patch (text/plain), 2.07 KB, created by Toshio Ernie Kuratomi on 2013-01-15 00:58:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2013-01-15 00:58:25 UTC

Size: 2.07 KB

patch

obsolete

>Index: nml-0.2.3/nml/actions/real_sprite.py
>===================================================================
>--- nml-0.2.3.orig/nml/actions/real_sprite.py
>+++ nml-0.2.3/nml/actions/real_sprite.py
>@@ -16,7 +16,8 @@ with NML; if not, write to the Free Soft
> from nml import generic, expression
> from nml.actions import base_action
> from nml.ast import assignment
>-import os, Image
>+import os
>+from PIL import Image
> 
> palmap_d2w = [
>           0, 215, 216, 136,  88, 106,  32,  33, #   0..7
>Index: nml-0.2.3/nml/ast/alt_sprites.py
>===================================================================
>--- nml-0.2.3.orig/nml/ast/alt_sprites.py
>+++ nml-0.2.3/nml/ast/alt_sprites.py
>@@ -16,7 +16,8 @@ with NML; if not, write to the Free Soft
> from nml import expression, generic, global_constants
> from nml.actions import real_sprite
> from nml.ast import base_statement
>-import os, Image
>+import os
>+from PIL import Image
> 
> """
> List with all AltSpritesBlocks encountered in the nml file.
>Index: nml-0.2.3/nml/main.py
>===================================================================
>--- nml-0.2.3.orig/nml/main.py
>+++ nml-0.2.3/nml/main.py
>@@ -19,7 +19,7 @@ from nml.actions import action2layout, a
> from nml.ast import general, grf, alt_sprites
> 
> try:
>-    import Image
>+    from PIL import Image
> except ImportError:
>     pass
> 
>Index: nml-0.2.3/nml/output_grf.py
>===================================================================
>--- nml-0.2.3.orig/nml/output_grf.py
>+++ nml-0.2.3/nml/output_grf.py
>@@ -18,7 +18,7 @@ from nml import generic, palette, output
> from nml.actions.real_sprite import palmap_w2d
> 
> try:
>-    import Image
>+    from PIL import Image
> except ImportError:
>     pass
> 
>Index: nml-0.2.3/nml/version_info.py
>===================================================================
>--- nml-0.2.3.orig/nml/version_info.py
>+++ nml-0.2.3/nml/version_info.py
>@@ -45,7 +45,7 @@ def get_lib_versions():
>     versions = {}
>     #PIL
>     try:
>-        import Image
>+        from PIL import Image
>         versions["PIL"] = Image.VERSION
>     except ImportError:
>         versions["PIL"] = "Not found!"

Actions: View | Diff

Attachments on bug 895290: 678529