Attachment 678443 Details for Bug 895238 – 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

gourmet-pillow.patch (text/plain), 4.70 KB, created by Toshio Ernie Kuratomi on 2013-01-14 21:47:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2013-01-14 21:47:29 UTC

Size: 4.70 KB

patch

obsolete

>Index: gourmet-0.15.9/src/lib/exporters/exporter.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/exporters/exporter.py
>+++ gourmet-0.15.9/src/lib/exporters/exporter.py
>@@ -1,4 +1,5 @@
>-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types
>+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types
>+from PIL import Image
> from gourmet import gglobals, convert
> from gourmet.gdebug import *
> from gettext import gettext as _
>Index: gourmet-0.15.9/src/lib/GourmetRecipeManager.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/GourmetRecipeManager.py
>+++ gourmet-0.15.9/src/lib/GourmetRecipeManager.py
>@@ -1,6 +1,6 @@
> #!/usr/bin/env python
> import os.path, time, os, sys, re, threading, StringIO, pango, string
>-import Image
>+from PIL import Image
> import gtk.glade, gtk, gobject, gtk.gdk, traceback
> import batchEditor
> import recipeManager
>Index: gourmet-0.15.9/src/lib/gtk_extras/ratingWidget.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/gtk_extras/ratingWidget.py
>+++ gourmet-0.15.9/src/lib/gtk_extras/ratingWidget.py
>@@ -1,7 +1,8 @@
> import gtk, gtk.gdk
> import gobject
> import gourmet.gglobals as gglobals
>-import Image, os.path
>+import os.path
>+from PIL import Image
> from gettext import gettext as _
> import tempfile
> 
>Index: gourmet-0.15.9/src/lib/gtk_extras/thumbnail.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/gtk_extras/thumbnail.py
>+++ gourmet-0.15.9/src/lib/gtk_extras/thumbnail.py
>@@ -1,4 +1,5 @@
>-import Image, urllib, hashlib, os.path, os, StringIO
>+import urllib, hashlib, os.path, os, StringIO
>+from PIL import Image
> from gourmet.gdebug import debug
> 
> MAX_THUMBSIZE=10000000
>@@ -78,7 +79,7 @@ def create_thumbnail (path, thumbpath, u
>     info['URI']=str(uri)
>     # now we must create our image guy
>     try:
>-        import PngImagePlugin
>+        from PIL import PngImagePlugin
>         pnginfo = PngImagePlugin.PngInfo()
>         use_our_png=False
>     except AttributeError:
>Index: gourmet-0.15.9/src/lib/ImageExtras.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/ImageExtras.py
>+++ gourmet-0.15.9/src/lib/ImageExtras.py
>@@ -1,4 +1,5 @@
>-import os, os.path, tempfile, gtk, Image, StringIO
>+import os, os.path, tempfile, gtk , StringIO
>+from PIL import Image
> from gdebug import *
> 
> TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_')
>Index: gourmet-0.15.9/src/lib/plugins/import_export/html_plugin/html_exporter.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/plugins/import_export/html_plugin/html_exporter.py
>+++ gourmet-0.15.9/src/lib/plugins/import_export/html_plugin/html_exporter.py
>@@ -1,4 +1,5 @@
>-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
>+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
>+from PIL import Image
> from gettext import gettext as _
> from gourmet import convert,gglobals
> from gourmet.gdebug import *
>Index: gourmet-0.15.9/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
>+++ gourmet-0.15.9/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
>@@ -1,4 +1,5 @@
>-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
>+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
>+from PIL import Image
> from gourmet import gglobals,  convert
> from gourmet.exporters.exporter import *
> from gourmet.gdebug import *
>Index: gourmet-0.15.9/src/lib/PngImagePluginUpToDate.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/PngImagePluginUpToDate.py
>+++ gourmet-0.15.9/src/lib/PngImagePluginUpToDate.py
>@@ -34,7 +34,7 @@ __version__ = "0.8"
> 
> import re, string
> 
>-import Image, ImageFile, ImagePalette
>+from PIL import Image, ImageFile, ImagePalette
> 
> 
> def i16(c):
>Index: gourmet-0.15.9/src/lib/reccard.py
>===================================================================
>--- gourmet-0.15.9.orig/src/lib/reccard.py
>+++ gourmet-0.15.9/src/lib/reccard.py
>@@ -1,6 +1,7 @@
> #!/usr/bin/env python
> import gc
>-import gtk.glade, gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, Image, StringIO, pango, string
>+import gtk.glade, gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, StringIO, pango, string
>+from PIL import Image
> import types
> import xml.sax.saxutils, pango
> import exporters.exportManager

Actions: View | Diff

Attachments on bug 895238: 678443