From 41a4f22c27ea96e7e32cafc6b1e4a68a7585db34 Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Tue, 16 Sep 2008 14:03:39 +0000 Subject: [PATCH] messy typo adding errback --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40245 --- scrapy/trunk/scrapy/contrib/pipeline/media.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scrapy/trunk/scrapy/contrib/pipeline/media.py b/scrapy/trunk/scrapy/contrib/pipeline/media.py index 3cf891a98..6ae55e3a1 100644 --- a/scrapy/trunk/scrapy/contrib/pipeline/media.py +++ b/scrapy/trunk/scrapy/contrib/pipeline/media.py @@ -71,6 +71,9 @@ class MediaPipeline(object): return wad def _download(self, request, info, fp): + def _bugtrap(_failure): + log.msg('Unhandled ERROR in MediaPipeline._downloaded: %s' % (_failure), log.ERROR, domain=info.domain) + dwld = mustbe_deferred(self.download, request, info) dwld.addCallbacks( callback=self.media_downloaded, @@ -79,12 +82,9 @@ class MediaPipeline(object): errbackArgs=(request, info), ) dwld.addBoth(self._downloaded, info, fp) + dwld.addErrback(_bugtrap) info.downloading[fp] = (request, dwld) - def _bugtrap(_failure): - log.msg('Unhandled ERROR in MediaPipeline._downloaded: %s' % (_failure), log.ERROR, domain=info.domain) - dwld.errback(_bugtrap) - def _downloaded(self, result, info, fp): info.downloaded[fp] = result # cache result waiting = info.waiting[fp] # client list