Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Merge remote-tracking branch 'origin/master' into asyncio-signals

Andrey Rakhmatullin7687564c736c
diff --cc scrapy/utils/defer.py
index a2c24e5fb,62b43a96c..826dc4826
--- a/scrapy/utils/defer.py
+++ b/scrapy/utils/defer.py
@@@ -142,18 -143,13 +143,30 @@@ def deferred_from_coro(o)
return o
+ def deferred_f_from_coro_f(coro_f):
+ """ Converts a coroutine function into a function that returns a Deferred.
+
+ The coroutine function will be called at the time when the wrapper is called. Wrapper args will be passed to it.
+ This is useful for callback chains, as callback functions are called with the previous callback result.
+ """
+ @wraps(coro_f)
+ def f(*coro_args, **coro_kwargs):
+ return deferred_from_coro(coro_f(*coro_args, **coro_kwargs))
+ return f
++
++
+def maybeDeferred_coro(f, *args, **kw):
+ """ Copy of defer.maybeDeferred that also converts coroutines to Deferreds. """
+ try:
+ result = f(*args, **kw)
+ except: # noqa: E722
+ return defer.fail(failure.Failure(captureVars=defer.Deferred.debug))
+
+ if isinstance(result, defer.Deferred):
+ return result
+ elif _isfuture(result) or inspect.isawaitable(result):
+ return deferred_from_coro(result)
+ elif isinstance(result, failure.Failure):
+ return defer.fail(result)
+ else:
+ return defer.succeed(result)