From d20b371de1a6aefde25b82ce252c1f026d89d8de Mon Sep 17 00:00:00 2001 From: giovannibajo Date: Sun, 1 Mar 2009 11:05:45 +0000 Subject: [PATCH] Fix the import hook for PIL to be Python 2.5-compatible git-svn-id: http://svn.pyinstaller.org/trunk@631 8dd32b29-ccff-0310-8a9a-9233e24343b1 --- hooks/hook-Image.py | 2 +- hooks/hook-PIL.Image.py | 2 +- hooks/hook-PIL.SpiderImagePlugin.py | 2 +- hooks/hook-PIL.py | 1 + hooks/hook-SpiderImagePlugin.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 hooks/hook-PIL.py diff --git a/hooks/hook-Image.py b/hooks/hook-Image.py index ef2d0a6..63679bc 100644 --- a/hooks/hook-Image.py +++ b/hooks/hook-Image.py @@ -18,4 +18,4 @@ # Forward to shared code for PIL. PIL can be imported either as a top-level package # (from PIL import Image), or not (import Image), because it installs a # PIL.pth. -from shared_PIL_Image import * +from hooks.shared_PIL_Image import * diff --git a/hooks/hook-PIL.Image.py b/hooks/hook-PIL.Image.py index cb8a833..f487bcd 100644 --- a/hooks/hook-PIL.Image.py +++ b/hooks/hook-PIL.Image.py @@ -26,4 +26,4 @@ __name__ = "hook-image" # Forward to shared code for PIL. PIL can be imported either as a top-level package # (from PIL import Image), or not (import Image), because it installs a # PIL.pth. -from shared_PIL_Image import * +from hooks.shared_PIL_Image import * diff --git a/hooks/hook-PIL.SpiderImagePlugin.py b/hooks/hook-PIL.SpiderImagePlugin.py index fd2f266..8458f6b 100644 --- a/hooks/hook-PIL.SpiderImagePlugin.py +++ b/hooks/hook-PIL.SpiderImagePlugin.py @@ -18,4 +18,4 @@ # Forward to shared code for PIL. PIL can be imported either as a top-level package # (from PIL import Image), or not (import Image), because it installs a # PIL.pth. -from shared_PIL_SpiderImagePlugin import * +from hooks.shared_PIL_SpiderImagePlugin import * diff --git a/hooks/hook-PIL.py b/hooks/hook-PIL.py new file mode 100644 index 0000000..ad2447c --- /dev/null +++ b/hooks/hook-PIL.py @@ -0,0 +1 @@ +# empty (just to need Python import machinery happy) diff --git a/hooks/hook-SpiderImagePlugin.py b/hooks/hook-SpiderImagePlugin.py index fd2f266..8458f6b 100644 --- a/hooks/hook-SpiderImagePlugin.py +++ b/hooks/hook-SpiderImagePlugin.py @@ -18,4 +18,4 @@ # Forward to shared code for PIL. PIL can be imported either as a top-level package # (from PIL import Image), or not (import Image), because it installs a # PIL.pth. -from shared_PIL_SpiderImagePlugin import * +from hooks.shared_PIL_SpiderImagePlugin import *