restore request's callback after calling custom callback

scrapy/commands/parse.py

@@ -192,6 +192,9 @@ def callback(response):
             # parse items and requests
             depth = response.meta['_depth']
 
+            if response.request.callback:
+                response.request.callback = response.meta['_callback']
+
             items, requests = self.run_callback(response, cb)
             if opts.pipelines:
                 itemproc = self.pcrawler.engine.scraper.itemproc

tests/test_command_parse.py

@@ -70,6 +70,26 @@ class MyBadCrawlSpider(CrawlSpider):
 
     def parse(self, response):
         return [scrapy.Item(), dict(foo='bar')]
+
+
+class MyInfiniteCallbackSpider(scrapy.Spider):
+
+    name = 'infinitecb{0}'
+
+    def parse(self, response):
+        if response.meta.get('retried'):
+            yield dict(foo='bar')
+            return
+
+        response.meta['retried'] = True
+        yield response.request.replace(dont_filter=True)
+
+    def custom_parse(self, response):
+        if response.meta.get('retried'):
+            yield dict(anotherfoo='anotherbar')
+            return
+        response.meta['retried'] = True
+        yield response.request.replace(dont_filter=True)
 """.format(self.spider_name))
 
         fname = abspath(join(self.proj_mod_path, 'pipelines.py'))
@@ -193,3 +213,18 @@ def test_crawlspider_no_matching_rule(self):
         )
         self.assertRegexpMatches(to_native_str(out), """# Scraped Items  -+\n\[\]""")
         self.assertIn("""Cannot find a rule that matches""", to_native_str(stderr))
+
+    @defer.inlineCallbacks
+    def test_parse_item_callback_infinite_loop(self):
+        status, out, stderr = yield self.execute(
+            ['--spider', 'infinitecb'+self.spider_name, '-d', '2', self.url('/html')]
+        )
+        self.assertIn("""[{'foo': 'bar'}]""", to_native_str(out))
+
+    @defer.inlineCallbacks
+    def test_parse_item_callback_infinite_loop_custom_callback(self):
+        status, out, stderr = yield self.execute(['--spider',
+                                                  'infinitecb'+self.spider_name,
+                                                  '-d', '2', '-c', 'custom_parse',
+                                                  self.url('/html')])
+        self.assertIn("""[{'anotherfoo': 'anotherbar'}]""", to_native_str(out))