Attachment 678527 Details for Bug 895288 – Patch to use the form of import of PIL that is pillow compatible

[patch] Patch to use the form of import of PIL that is pillow compatible

mcomix-pillow.patch (text/plain), 2.39 KB, created by Toshio Ernie Kuratomi on 2013-01-15 00:45:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2013-01-15 00:45:19 UTC

Size: 2.39 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 895288: 678527