Scrapy, a fast high-level web crawling & scraping framework for Python.
Simple replacements of get_event_loop(). (#8324)
Andrey Rakhmatullin47896d79d399
diff --git a/scrapy/core/engine.py b/scrapy/core/engine.pyindex 254652c1e..0fd6a22cb 100644--- a/scrapy/core/engine.py+++ b/scrapy/core/engine.py@@ -348,7 +348,7 @@ class ExecutionEngine:if is_asyncio_available():# not wrapping in a Deferred here to avoid https://github.com/twisted/twisted/issues/12470# (can happen when this is cancelled, e.g. in test_close_during_start_iteration())- self._start_request_processing_awaitable = asyncio.ensure_future(coro)+ self._start_request_processing_awaitable = asyncio.create_task(coro)else:self._start_request_processing_awaitable = Deferred.fromCoroutine(coro)elif self.state is EngineState.STOPPING:diff --git a/scrapy/utils/defer.py b/scrapy/utils/defer.pyindex 4ce1a78fb..70609aee6 100644--- a/scrapy/utils/defer.py+++ b/scrapy/utils/defer.py@@ -635,8 +635,7 @@ def _schedule_coro(coro: Coroutine[Any, Any, Any]) -> None:if not is_asyncio_available():Deferred.fromCoroutine(coro)return- loop = asyncio.get_event_loop()- loop.create_task(coro) # noqa: RUF006+ asyncio.create_task(coro) # noqa: RUF006@overloaddiff --git a/tests/AsyncCrawlerProcess/asyncio_enabled_reactor_same_loop.py b/tests/AsyncCrawlerProcess/asyncio_enabled_reactor_same_loop.pyindex 9c6fd090b..bd9b25e3e 100644--- a/tests/AsyncCrawlerProcess/asyncio_enabled_reactor_same_loop.py+++ b/tests/AsyncCrawlerProcess/asyncio_enabled_reactor_same_loop.py@@ -9,8 +9,9 @@ from scrapy.crawler import AsyncCrawlerProcessif sys.platform == "win32":asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())-asyncio.set_event_loop(Loop())-asyncioreactor.install(asyncio.get_event_loop())+loop = Loop()+asyncio.set_event_loop(loop)+asyncioreactor.install(loop)class NoRequestsSpider(scrapy.Spider):diff --git a/tests/test_pipelines.py b/tests/test_pipelines.pyindex c8ad2386a..003076a1d 100644--- a/tests/test_pipelines.py+++ b/tests/test_pipelines.py@@ -70,7 +70,7 @@ class AsyncDefPipeline:class AsyncDefAsyncioPipeline:async def process_item(self, item):d: Deferred[Any] = Deferred()- loop = asyncio.get_event_loop()+ loop = asyncio.get_running_loop()loop.call_later(0, d.callback, None)await deferred_to_future(d)await asyncio.sleep(0.2)diff --git a/tests/test_utils_defer.py b/tests/test_utils_defer.pyindex b10ddd25b..8c63de927 100644--- a/tests/test_utils_defer.py+++ b/tests/test_utils_defer.py@@ -147,7 +147,7 @@ class _ReadTracker:def __enter__(self) -> Self:if is_asyncio_available():- asyncio.get_event_loop().add_reader(self._rx, self._read)+ asyncio.get_running_loop().add_reader(self._rx, self._read)else:from twisted.internet import reactor@@ -157,7 +157,7 @@ class _ReadTracker:def __exit__(self, *exc_info: object) -> None:if is_asyncio_available():- asyncio.get_event_loop().remove_reader(self._rx)+ asyncio.get_running_loop().remove_reader(self._rx)else:from twisted.internet import reactor