|
Mamoru Tasaka |
2ca72a2 |
Index: mcomix-0.99/mcomix/histogram.py
|
|
Mamoru Tasaka |
2ca72a2 |
===================================================================
|
|
Mamoru Tasaka |
2ca72a2 |
--- mcomix-0.99.orig/mcomix/histogram.py
|
|
Mamoru Tasaka |
2ca72a2 |
+++ mcomix-0.99/mcomix/histogram.py
|
|
Mamoru Tasaka |
2ca72a2 |
@@ -1,8 +1,8 @@
|
|
Mamoru Tasaka |
2ca72a2 |
"""histogram.py - Draw histograms (RGB) from pixbufs."""
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
-import Image
|
|
Mamoru Tasaka |
2ca72a2 |
-import ImageDraw
|
|
Mamoru Tasaka |
2ca72a2 |
-import ImageOps
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import Image
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import ImageDraw
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import ImageOps
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
from mcomix import image_tools
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
Index: mcomix-0.99/mcomix/image_tools.py
|
|
Mamoru Tasaka |
2ca72a2 |
===================================================================
|
|
Mamoru Tasaka |
2ca72a2 |
--- mcomix-0.99.orig/mcomix/image_tools.py
|
|
Mamoru Tasaka |
2ca72a2 |
+++ mcomix-0.99/mcomix/image_tools.py
|
|
Mamoru Tasaka |
2ca72a2 |
@@ -6,9 +6,9 @@ import operator
|
|
Mamoru Tasaka |
2ca72a2 |
import itertools
|
|
Mamoru Tasaka |
2ca72a2 |
import bisect
|
|
Mamoru Tasaka |
2ca72a2 |
import gtk
|
|
Mamoru Tasaka |
2ca72a2 |
-import Image
|
|
Mamoru Tasaka |
2ca72a2 |
-import ImageEnhance
|
|
Mamoru Tasaka |
2ca72a2 |
-import ImageOps
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import Image
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import ImageEnhance
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import ImageOps
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
from mcomix.preferences import prefs
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
Index: mcomix-0.99/mcomix/library/book_area.py
|
|
Mamoru Tasaka |
2ca72a2 |
===================================================================
|
|
Mamoru Tasaka |
2ca72a2 |
--- mcomix-0.99.orig/mcomix/library/book_area.py
|
|
Mamoru Tasaka |
2ca72a2 |
+++ mcomix-0.99/mcomix/library/book_area.py
|
|
Mamoru Tasaka |
2ca72a2 |
@@ -4,8 +4,8 @@ import os
|
|
Mamoru Tasaka |
2ca72a2 |
import urllib
|
|
Mamoru Tasaka |
2ca72a2 |
import gtk
|
|
Mamoru Tasaka |
2ca72a2 |
import gobject
|
|
Mamoru Tasaka |
2ca72a2 |
-import Image
|
|
Mamoru Tasaka |
2ca72a2 |
-import ImageDraw
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import Image
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import ImageDraw
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
from mcomix.preferences import prefs
|
|
Mamoru Tasaka |
2ca72a2 |
from mcomix import thumbnail_view
|
|
Mamoru Tasaka |
2ca72a2 |
Index: mcomix-0.99/mcomix/run.py
|
|
Mamoru Tasaka |
2ca72a2 |
===================================================================
|
|
Mamoru Tasaka |
2ca72a2 |
--- mcomix-0.99.orig/mcomix/run.py
|
|
Mamoru Tasaka |
2ca72a2 |
+++ mcomix-0.99/mcomix/run.py
|
|
Mamoru Tasaka |
2ca72a2 |
@@ -138,7 +138,7 @@ except ImportError:
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
# Check PIL library
|
|
Mamoru Tasaka |
2ca72a2 |
try:
|
|
Mamoru Tasaka |
2ca72a2 |
- import Image
|
|
Mamoru Tasaka |
2ca72a2 |
+ from PIL import Image
|
|
Mamoru Tasaka |
2ca72a2 |
assert Image.VERSION >= '1.1.5'
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
except AssertionError:
|
|
Mamoru Tasaka |
2ca72a2 |
Index: mcomix-0.99/mcomix/thumbnail_tools.py
|
|
Mamoru Tasaka |
2ca72a2 |
===================================================================
|
|
Mamoru Tasaka |
2ca72a2 |
--- mcomix-0.99.orig/mcomix/thumbnail_tools.py
|
|
Mamoru Tasaka |
2ca72a2 |
+++ mcomix-0.99/mcomix/thumbnail_tools.py
|
|
Mamoru Tasaka |
2ca72a2 |
@@ -9,7 +9,7 @@ import tempfile
|
|
Mamoru Tasaka |
2ca72a2 |
import mimetypes
|
|
Mamoru Tasaka |
2ca72a2 |
import threading
|
|
Mamoru Tasaka |
2ca72a2 |
import itertools
|
|
Mamoru Tasaka |
2ca72a2 |
-import Image
|
|
Mamoru Tasaka |
2ca72a2 |
+from PIL import Image
|
|
Mamoru Tasaka |
2ca72a2 |
from urllib import pathname2url
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
try: # The md5 module is deprecated as of Python 2.5, replaced by hashlib.
|
|
Mamoru Tasaka |
2ca72a2 |
Index: mcomix-0.99/mime/comicthumb
|
|
Mamoru Tasaka |
2ca72a2 |
===================================================================
|
|
Mamoru Tasaka |
2ca72a2 |
--- mcomix-0.99.orig/mime/comicthumb
|
|
Mamoru Tasaka |
2ca72a2 |
+++ mcomix-0.99/mime/comicthumb
|
|
Mamoru Tasaka |
2ca72a2 |
@@ -22,7 +22,7 @@ import tarfile
|
|
Mamoru Tasaka |
2ca72a2 |
import subprocess
|
|
Mamoru Tasaka |
2ca72a2 |
|
|
Mamoru Tasaka |
2ca72a2 |
try:
|
|
Mamoru Tasaka |
2ca72a2 |
- import Image
|
|
Mamoru Tasaka |
2ca72a2 |
+ from PIL import Image
|
|
Mamoru Tasaka |
2ca72a2 |
except ImportError:
|
|
Mamoru Tasaka |
2ca72a2 |
print '! Could not import the Image module (PIL).'
|
|
Mamoru Tasaka |
2ca72a2 |
print __doc__
|