From a45dca32f5496b7de3e37809504bb72e634a8a6c Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Wed, 27 Jul 2011 13:21:58 -0300 Subject: [PATCH] removed deprecation warning (scheduled to be removed on Scrapy 0.11) --- scrapy/contrib/pipeline/__init__.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/scrapy/contrib/pipeline/__init__.py b/scrapy/contrib/pipeline/__init__.py index 2e6cc8626..c1c7e5a22 100644 --- a/scrapy/contrib/pipeline/__init__.py +++ b/scrapy/contrib/pipeline/__init__.py @@ -4,9 +4,7 @@ Item pipeline See documentation in docs/item-pipeline.rst """ -from scrapy import log from scrapy.middleware import MiddlewareManager -from scrapy.utils.python import get_func_args class ItemPipelineManager(MiddlewareManager): @@ -16,22 +14,10 @@ class ItemPipelineManager(MiddlewareManager): def _get_mwlist_from_settings(cls, settings): return settings.getlist('ITEM_PIPELINES') - # FIXME: remove in Scrapy 0.11 - def _wrap_old_process_item(self, old): - def new(item, spider): - return old(spider, item) - return new - def _add_middleware(self, pipe): super(ItemPipelineManager, self)._add_middleware(pipe) - func = getattr(pipe, 'process_item', None) - if func: - # FIXME: remove in Scrapy 0.11 - fargs = get_func_args(func.im_func) - if fargs and fargs[1] == 'spider': - log.msg("Update %s.process_item() method to receive (item, spider) instead of (spider, item) or they will stop working on Scrapy 0.11" % pipe.__class__.__name__, log.WARNING) - func = self._wrap_old_process_item(func) - self.methods['process_item'].append(func) + if hasattr(pipe, 'process_item'): + self.methods['process_item'].append(pipe.process_item) def process_item(self, item, spider): return self._process_chain('process_item', item, spider)