Replace scrapy.utils.defer.deferred_from_coro

Author: elacuesta

scrapy_playwright/_utils.py

@@ -9,7 +9,9 @@
 from scrapy.http.headers import Headers
 from scrapy.settings import Settings
 from scrapy.utils.python import to_unicode
+from twisted.internet import reactor
 from twisted.internet.defer import Deferred
+from twisted.python import failure
 from w3lib.encoding import html_body_declared_encoding, http_content_type_encoding
 
 
@@ -115,24 +117,26 @@ class _ThreadedLoopAdapter:
     _stop_events: Dict[int, asyncio.Event] = {}
 
     @classmethod
-    async def _handle_coro(cls, coro, future) -> None:
+    async def _handle_coro(cls, coro: Awaitable, dfd: Deferred) -> None:
         try:
-            future.set_result(await coro)
+            result = await coro
         except Exception as exc:
-            future.set_exception(exc)
+            reactor.callFromThread(dfd.errback, failure.Failure(exc))
+        else:
+            reactor.callFromThread(dfd.callback, result)
 
     @classmethod
     async def _process_queue(cls) -> None:
         while any(not ev.is_set() for ev in cls._stop_events.values()):
-            coro, future = await cls._coro_queue.get()
-            asyncio.create_task(cls._handle_coro(coro, future))
+            coro, dfd = await cls._coro_queue.get()
+            asyncio.create_task(cls._handle_coro(coro, dfd))
             cls._coro_queue.task_done()
 
     @classmethod
     def _deferred_from_coro(cls, coro) -> Deferred:
-        future: asyncio.Future = asyncio.Future()
-        asyncio.run_coroutine_threadsafe(cls._coro_queue.put((coro, future)), cls._loop)
-        return scrapy.utils.defer.deferred_from_coro(future)
+        dfd: Deferred = Deferred()
+        asyncio.run_coroutine_threadsafe(cls._coro_queue.put((coro, dfd)), cls._loop)
+        return dfd
 
     @classmethod
     def start(cls, caller_id: int) -> None: