RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed process_results name in feed spiders to process_spider_output and moved its parameters to a more standard order 

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40680
This commit is contained in:
elpolilla 2009-01-08 10:11:56 +00:00
parent 32d842326a
commit 8278c0cffc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrapy/trunk/scrapy/contrib/spiders/crawl.py
View File

@ -67,7 +67,7 @@ class CrawlSpider(BaseSpider):
return a list of ScrapedItems and/or Requests"""
return []
def process_spider_output(self, results, response):
def process_spider_output(self, response, results):
"""This overridable method is called for each result (item or request)
returned by the spider, and it's intended to perform any last time
processing required before returning the results to the framework core,
@ -107,7 +107,7 @@ class CrawlSpider(BaseSpider):
res.extend(self._requests_to_follow(response))
if callback:
cb_res = callback(response, **cb_kwargs) or ()
cb_res = self.process_spider_output(cb_res, response)
cb_res = self.process_spider_output(response, cb_res)
res.extend(cb_res)
return res

8
scrapy/trunk/scrapy/contrib/spiders/feed.py
View File

@ -19,7 +19,7 @@ class XMLFeedSpider(BaseSpider):
iterator = 'iternodes'
itertag = 'item'
def process_results(self, results, response):
def process_spider_output(self, response, results):
"""This overridable method is called for each result (item or request)
returned by the spider, and it's intended to perform any last time
processing required before returning the results to the framework core,
@ -40,7 +40,7 @@ class XMLFeedSpider(BaseSpider):
ret = [ret]
if not isinstance(ret, (list, tuple)):
raise UsageError('You cannot return an "%s" object from a spider' % type(ret).__name__)
for result_item in self.process_results(ret, response):
for result_item in self.process_spider_output(response, ret):
yield result_item
def parse(self, response):
@ -71,7 +71,7 @@ class CSVFeedSpider(BaseSpider):
delimiter = None # When this is None, python's csv module's default delimiter is used
headers = None
def process_results(self, results, response):
def process_spider_output(self, response, results):
"""This method has the same purpose as the one in XMLFeedSpider"""
return results
@ -86,7 +86,7 @@ class CSVFeedSpider(BaseSpider):
ret = [ret]
if not isinstance(ret, (list, tuple)):
raise UsageError('You cannot return an "%s" object from a spider' % type(ret).__name__)
for result_item in self.process_results(ret, response):
for result_item in self.process_spider_output(response, ret):
yield result_item
def parse(self, response):