mirror of https://github.com/scrapy/scrapy.git
simplify chain_deferred implementation
--HG-- extra : rebase_source : e8a3639051c560f8fa2d75fc5469194723fe3ef9
This commit is contained in:
parent
61b1e67cd3
commit
bd59748de6
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Reference in New Issue