|
|
494b65b |
diff -r 7c249349d2a9 -r ab7e104b7811 nml/actions/real_sprite.py
|
|
|
494b65b |
--- a/nml/actions/real_sprite.py
|
|
|
494b65b |
+++ b/nml/actions/real_sprite.py
|
|
|
494b65b |
@@ -16,7 +16,8 @@
|
|
|
494b65b |
from nml import generic, expression
|
|
|
494b65b |
from nml.actions import base_action
|
|
|
494b65b |
from nml.ast import assignment
|
|
|
494b65b |
-import os, Image
|
|
|
494b65b |
+import os
|
|
|
494b65b |
+from PIL import Image
|
|
|
494b65b |
|
|
|
494b65b |
palmap_d2w = [
|
|
|
494b65b |
0, 215, 216, 136, 88, 106, 32, 33, # 0..7
|
|
|
494b65b |
diff -r 7c249349d2a9 -r ab7e104b7811 nml/ast/alt_sprites.py
|
|
|
494b65b |
--- a/nml/ast/alt_sprites.py
|
|
|
494b65b |
+++ b/nml/ast/alt_sprites.py
|
|
|
494b65b |
@@ -16,7 +16,8 @@
|
|
|
494b65b |
from nml import expression, generic, global_constants
|
|
|
494b65b |
from nml.actions import real_sprite
|
|
|
494b65b |
from nml.ast import base_statement
|
|
|
494b65b |
-import os, Image
|
|
|
494b65b |
+import os
|
|
|
494b65b |
+from PIL import Image
|
|
|
494b65b |
|
|
|
494b65b |
"""
|
|
|
494b65b |
List with all AltSpritesBlocks encountered in the nml file.
|
|
|
494b65b |
diff -r 7c249349d2a9 -r ab7e104b7811 nml/main.py
|
|
|
494b65b |
--- a/nml/main.py
|
|
|
494b65b |
+++ b/nml/main.py
|
|
|
494b65b |
@@ -19,7 +19,7 @@
|
|
|
494b65b |
from nml.ast import general, grf, alt_sprites
|
|
|
494b65b |
|
|
|
494b65b |
try:
|
|
|
494b65b |
- import Image
|
|
|
494b65b |
+ from PIL import Image
|
|
|
494b65b |
except ImportError:
|
|
|
494b65b |
pass
|
|
|
494b65b |
|
|
|
494b65b |
diff -r 7c249349d2a9 -r ab7e104b7811 nml/output_grf.py
|
|
|
494b65b |
--- a/nml/output_grf.py
|
|
|
494b65b |
+++ b/nml/output_grf.py
|
|
|
494b65b |
@@ -18,7 +18,7 @@
|
|
|
494b65b |
from nml.actions.real_sprite import palmap_w2d
|
|
|
494b65b |
|
|
|
494b65b |
try:
|
|
|
494b65b |
- import Image
|
|
|
494b65b |
+ from PIL import Image
|
|
|
494b65b |
except ImportError:
|
|
|
494b65b |
pass
|
|
|
494b65b |
|
|
|
494b65b |
diff -r 7c249349d2a9 -r ab7e104b7811 nml/version_info.py
|
|
|
494b65b |
--- a/nml/version_info.py
|
|
|
494b65b |
+++ b/nml/version_info.py
|
|
|
494b65b |
@@ -47,7 +47,7 @@
|
|
|
494b65b |
versions = {}
|
|
|
494b65b |
#PIL
|
|
|
494b65b |
try:
|
|
|
494b65b |
- import Image
|
|
|
494b65b |
+ from PIL import Image
|
|
|
494b65b |
versions["PIL"] = Image.VERSION
|
|
|
494b65b |
except ImportError:
|
|
|
494b65b |
versions["PIL"] = "Not found!"
|