blob: 64d9980a881be6fd39776fc0acb5f23f3a72a53d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
https://sourceforge.net/p/pysolfc/patches/10/
https://bugs.gentoo.org/show_bug.cgi?id=471514
Index: pysollib/mfxutil.py
===================================================================
diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
--- a/pysollib/mfxutil.py (revision 279)
+++ b/pysollib/mfxutil.py (working copy)
@@ -41,18 +41,18 @@
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
USE_PIL = False
if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
Index: scripts/cardset_viewer.py
===================================================================
diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py
--- a/scripts/cardset_viewer.py (revision 279)
+++ b/scripts/cardset_viewer.py (working copy)
@@ -7,7 +7,7 @@
from math import sqrt, sin, cos, pi
from Tkinter import *
try:
- import Image, ImageTk
+ from PIL import Image, ImageTk
except ImportError:
Image = None
|
GitWeb
