From bd59748de604b272dd459602df3621df93f08c5b Mon Sep 17 00:00:00 2001
From: Daniel Grana <dangra@insophia.com>
Date: Sun, 21 Jun 2009 01:25:31 -0300
Subject: [PATCH] simplify chain_deferred implementation

--HG--
extra : rebase_source : e8a3639051c560f8fa2d75fc5469194723fe3ef9
---
 scrapy/utils/defer.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/scrapy/utils/defer.py b/scrapy/utils/defer.py
index 1a30087f1..1b265b92d 100644
--- a/scrapy/utils/defer.py
+++ b/scrapy/utils/defer.py
@@ -36,21 +36,7 @@ def mustbe_deferred(f, *args, **kw):
         return defer_result(result)
 
 def chain_deferred(d1, d2):
-    if callable(d2):
-        d2 = lambda_deferred(d2)
-
-    def _pause(_):
-        d2.pause()
-        reactor.callLater(0, d2.unpause)
-        return _
-
-    def _reclaim(_):
-        return d2
-
-    #d1.addBoth(_pause) ## needs more debugging before reenable it
-    d1.chainDeferred(d2)
-    d1.addBoth(_reclaim)
-    return d1
+    return d1.chainDeferred(d2).addBoth(lambda _:d2)
 
 def lambda_deferred(func):
     deferred = defer.Deferred()