From 9c19316d21bb836485940fbdc8e9646eec7547b3 Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Mon, 6 Oct 2008 02:36:39 +0000
Subject: [PATCH] removed unused imports and minor bug fix to media/image
 pipeline

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40305
---
 scrapy/trunk/scrapy/contrib/pipeline/images.py | 8 +++-----
 scrapy/trunk/scrapy/contrib/pipeline/media.py  | 3 ---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/scrapy/trunk/scrapy/contrib/pipeline/images.py b/scrapy/trunk/scrapy/contrib/pipeline/images.py
index 70d360b3b..e9f06cc03 100644
--- a/scrapy/trunk/scrapy/contrib/pipeline/images.py
+++ b/scrapy/trunk/scrapy/contrib/pipeline/images.py
@@ -1,9 +1,7 @@
-from __future__ import with_statement
-
 import re
 import os
 import time
-import sha
+import hashlib
 import urllib
 import urlparse
 from cStringIO import StringIO
@@ -12,7 +10,6 @@ import Image
 
 from scrapy import log
 from scrapy.stats import stats
-from scrapy.http import Request
 from scrapy.core.exceptions import DropItem, NotConfigured
 from scrapy.core.exceptions import HttpException
 from scrapy.conf import settings
@@ -96,6 +93,7 @@ class ImagesPipeline(MediaPipeline):
             log.msg(str(ex), level=log.WARNING, domain=info.domain)
             raise ex
         except Exception, ex:
+            referer = request.headers.get('Referer')
             msg = 'Image (processing-error): Error thumbnailing %s from %s referred in <%s>: %s' % (mtype, request, referer, ex)
             log.msg(msg, level=log.WARNING, domain=info.domain)
             raise ImageException(msg)
@@ -143,7 +141,7 @@ def image_path(url):
     if os.sep != '/':
         urlpath.replace('/', os.sep)
     if query:
-        img_path = os.path.join(netloc, sha.sha(url).hexdigest())
+        img_path = os.path.join(netloc, hashlib.sha1(url).hexdigest())
     else:
         img_path = os.path.join(netloc, urlpath[1:])
     return urllib.unquote(img_path)
diff --git a/scrapy/trunk/scrapy/contrib/pipeline/media.py b/scrapy/trunk/scrapy/contrib/pipeline/media.py
index b2dffad67..0c5c59d2c 100644
--- a/scrapy/trunk/scrapy/contrib/pipeline/media.py
+++ b/scrapy/trunk/scrapy/contrib/pipeline/media.py
@@ -3,10 +3,7 @@ from twisted.internet import defer
 from scrapy.utils.defer import mustbe_deferred, defer_result
 from scrapy import log
 from scrapy.core.engine import scrapyengine
-from scrapy.core.exceptions import DropItem, NotConfigured
-from scrapy.http import Request
 from scrapy.spider import spiders
-from scrapy.conf import settings
 
 
 class DomainInfo(object):