From 8278c0cffccee7f2c5e8c701284d5a6bacce9bbe Mon Sep 17 00:00:00 2001
From: elpolilla <none@none>
Date: Thu, 8 Jan 2009 10:11:56 +0000
Subject: [PATCH] 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
---
 scrapy/trunk/scrapy/contrib/spiders/crawl.py | 4 ++--
 scrapy/trunk/scrapy/contrib/spiders/feed.py  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scrapy/trunk/scrapy/contrib/spiders/crawl.py b/scrapy/trunk/scrapy/contrib/spiders/crawl.py
index 185f5cd4f..4056929f2 100644
--- a/scrapy/trunk/scrapy/contrib/spiders/crawl.py
+++ b/scrapy/trunk/scrapy/contrib/spiders/crawl.py
@@ -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
 
diff --git a/scrapy/trunk/scrapy/contrib/spiders/feed.py b/scrapy/trunk/scrapy/contrib/spiders/feed.py
index 9da11c267..f59167ed4 100644
--- a/scrapy/trunk/scrapy/contrib/spiders/feed.py
+++ b/scrapy/trunk/scrapy/contrib/spiders/feed.py
@@ -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):