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
50
51
52
53
54
55
56
57
58
59
60
61
62
|
Description: Fix PIL imports for pillow compatibility --
see 5117D0B7.801@debian.org (LP: 1160571).
There's a version of this patch (without the checks for ImportError) in
upstream's patch tracker at https://sourceforge.net/p/pysolfc/patches/10/
Author: Bernhard Reiter <ockham@raz.or.at>
Forwarded: no
--- a/pysollib/mfxutil.py
+++ b/pysollib/mfxutil.py
@@ -41,18 +41,30 @@
Image = ImageTk = ImageOps = None
if TOOLKIT == 'tk':
try: # PIL
- import Image
- import ImageTk
- import ImageOps
+ try:
+ from PIL import Image
+ from PIL import ImageTk
+ from PIL import ImageOps
+ except ImportError:
+ import Image
+ import ImageTk
+ import ImageOps
except ImportError:
Image = None
else:
# for py2exe
- import GifImagePlugin
- import PngImagePlugin
- import JpegImagePlugin
- import BmpImagePlugin
- import PpmImagePlugin
+ try:
+ from PIL import GifImagePlugin
+ from PIL import PngImagePlugin
+ from PIL import JpegImagePlugin
+ from PIL import BmpImagePlugin
+ from PIL import PpmImagePlugin
+ except ImportError:
+ import GifImagePlugin
+ import PngImagePlugin
+ import JpegImagePlugin
+ import BmpImagePlugin
+ import PpmImagePlugin
Image._initialized = 2
--- a/scripts/cardset_viewer.py
+++ b/scripts/cardset_viewer.py
@@ -7,7 +7,10 @@
from math import sqrt, sin, cos, pi
from Tkinter import *
try:
- import Image, ImageTk
+ try:
+ from PIL import Image, ImageTk
+ except ImportError:
+ import Image, ImageTk
except ImportError:
Image = None
|
