Skip to content

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

Small 3.7 and 3.8 cleanup.

Andrey Rakhmatullin7e07d48cc5bf
diff --git a/scrapy/utils/reactor.py b/scrapy/utils/reactor.py
index 18bb583b8..f8904a9aa 100644
--- a/scrapy/utils/reactor.py
+++ b/scrapy/utils/reactor.py
@@ -97,10 +97,8 @@ def get_asyncio_event_loop_policy() -> AbstractEventLoopPolicy:
def _get_asyncio_event_loop_policy() -> AbstractEventLoopPolicy:
policy = asyncio.get_event_loop_policy()
- if (
- sys.version_info >= (3, 8)
- and sys.platform == "win32"
- and not isinstance(policy, asyncio.WindowsSelectorEventLoopPolicy)
+ if sys.platform == "win32" and not isinstance(
+ policy, asyncio.WindowsSelectorEventLoopPolicy
):
policy = asyncio.WindowsSelectorEventLoopPolicy()
asyncio.set_event_loop_policy(policy)
diff --git a/tests/CrawlerProcess/asyncio_enabled_reactor.py b/tests/CrawlerProcess/asyncio_enabled_reactor.py
index 01d23c963..f013eed27 100644
--- a/tests/CrawlerProcess/asyncio_enabled_reactor.py
+++ b/tests/CrawlerProcess/asyncio_enabled_reactor.py
@@ -3,7 +3,7 @@ import sys
from twisted.internet import asyncioreactor
-if sys.version_info >= (3, 8) and sys.platform == "win32":
+if sys.platform == "win32":
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
asyncioreactor.install(asyncio.get_event_loop())
diff --git a/tests/CrawlerProcess/asyncio_enabled_reactor_different_loop.py b/tests/CrawlerProcess/asyncio_enabled_reactor_different_loop.py
index 9dc8ce46b..e9d6d8875 100644
--- a/tests/CrawlerProcess/asyncio_enabled_reactor_different_loop.py
+++ b/tests/CrawlerProcess/asyncio_enabled_reactor_different_loop.py
@@ -4,7 +4,7 @@ import sys
from twisted.internet import asyncioreactor
from twisted.python import log
-if sys.version_info >= (3, 8) and sys.platform == "win32":
+if sys.platform == "win32":
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
asyncioreactor.install(asyncio.get_event_loop())
diff --git a/tests/CrawlerProcess/asyncio_enabled_reactor_same_loop.py b/tests/CrawlerProcess/asyncio_enabled_reactor_same_loop.py
index be9c83b95..c72a0a17c 100644
--- a/tests/CrawlerProcess/asyncio_enabled_reactor_same_loop.py
+++ b/tests/CrawlerProcess/asyncio_enabled_reactor_same_loop.py
@@ -4,7 +4,7 @@ import sys
from twisted.internet import asyncioreactor
from uvloop import Loop
-if sys.version_info >= (3, 8) and sys.platform == "win32":
+if sys.platform == "win32":
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
asyncio.set_event_loop(Loop())
asyncioreactor.install(asyncio.get_event_loop())
diff --git a/tox.ini b/tox.ini
index 79f72a0f2..fbbce48d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,9 +26,6 @@ deps =
# mitmproxy does not support PyPy
mitmproxy; implementation_name != 'pypy'
- # https://github.com/pallets/werkzeug/pull/2768 breaks flask, required by
- # mitmproxy.
- werkzeug < 3; python_version < '3.9' and implementation_name != 'pypy'
passenv =
S3_TEST_FILE_URI
AWS_ACCESS_KEY_ID