From 7865fbf05a03e3177a7481bfa13521eae8829784 Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Fri, 20 Apr 2012 19:04:44 -0300
Subject: [PATCH] replace "import Image" by more standard "from PIL import
 Image". closes #88

---
 scrapy/contrib/pipeline/images.py    | 2 +-
 scrapy/tests/test_pipeline_images.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scrapy/contrib/pipeline/images.py b/scrapy/contrib/pipeline/images.py
index 15a6f037f..e1d183e0f 100644
--- a/scrapy/contrib/pipeline/images.py
+++ b/scrapy/contrib/pipeline/images.py
@@ -9,11 +9,11 @@ import time
 import hashlib
 import urlparse
 import rfc822
-import Image
 from cStringIO import StringIO
 from collections import defaultdict
 
 from twisted.internet import defer, threads
+from PIL import Image
 
 from scrapy.xlib.pydispatch import dispatcher
 from scrapy import log
diff --git a/scrapy/tests/test_pipeline_images.py b/scrapy/tests/test_pipeline_images.py
index 41e9be71f..09b71b7fe 100644
--- a/scrapy/tests/test_pipeline_images.py
+++ b/scrapy/tests/test_pipeline_images.py
@@ -7,7 +7,7 @@ from twisted.trial import unittest
 
 
 try:
-    import Image
+    from PIL import Image
     skip = False
 except ImportError, e:
     skip = True