Sophie

Sophie

distrib > Mageia > 6 > x86_64 > by-pkgid > 8a9e5af65957a35bbe608948d5fab7aa > files > 2

PySolFC-2.0-19.mga6.src.rpm

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