From 075ab156b0ac7bf56828fd40a843f3e9b63a3de3 Mon Sep 17 00:00:00 2001
From: Eugenio Lacuesta <eugenio.lacuesta@gmail.com>
Date: Mon, 23 Nov 2020 11:59:59 -0300
Subject: [PATCH 1/3] Deprecate scrapy.utils.py36 module

---
 scrapy/utils/py36.py   | 17 +++++++++--------
 scrapy/utils/python.py |  7 +++++++
 scrapy/utils/spider.py |  7 ++-----
 setup.cfg              |  3 ---
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/scrapy/utils/py36.py b/scrapy/utils/py36.py
index c8c24076e..070b145a4 100644
--- a/scrapy/utils/py36.py
+++ b/scrapy/utils/py36.py
@@ -1,10 +1,11 @@
-"""
-Helpers using Python 3.6+ syntax (ignore SyntaxError on import).
-"""
+import warnings
+
+from scrapy.exceptions import ScrapyDeprecationWarning
+from scrapy.utils.python import collect_asyncgen  # noqa: F401
 
 
-async def collect_asyncgen(result):
-    results = []
-    async for x in result:
-        results.append(x)
-    return results
+warnings.warn(
+    "Module `scrapy.utils.py36` is deprecated, please import from `scrapy.utils.python` instead.",
+    category=ScrapyDeprecationWarning,
+    stacklevel=2,
+)
diff --git a/scrapy/utils/python.py b/scrapy/utils/python.py
index 5703fd4c3..7bd286523 100644
--- a/scrapy/utils/python.py
+++ b/scrapy/utils/python.py
@@ -355,3 +355,10 @@ class MutableChain:
     @deprecated("scrapy.utils.python.MutableChain.__next__")
     def next(self):
         return self.__next__()
+
+
+async def collect_asyncgen(result):
+    results = []
+    async for x in result:
+        results.append(x)
+    return results
diff --git a/scrapy/utils/spider.py b/scrapy/utils/spider.py
index f3a9a67a3..5319604ba 100644
--- a/scrapy/utils/spider.py
+++ b/scrapy/utils/spider.py
@@ -4,17 +4,14 @@ import logging
 from scrapy.spiders import Spider
 from scrapy.utils.defer import deferred_from_coro
 from scrapy.utils.misc import arg_to_iter
-try:
-    from scrapy.utils.py36 import collect_asyncgen
-except SyntaxError:
-    collect_asyncgen = None
+from scrapy.utils.python import collect_asyncgen
 
 
 logger = logging.getLogger(__name__)
 
 
 def iterate_spider_output(result):
-    if collect_asyncgen and hasattr(inspect, 'isasyncgen') and inspect.isasyncgen(result):
+    if inspect.isasyncgen(result):
         d = deferred_from_coro(collect_asyncgen(result))
         d.addCallback(iterate_spider_output)
         return d
diff --git a/setup.cfg b/setup.cfg
index 8101443e3..0c9f6b963 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -55,9 +55,6 @@ ignore_errors = True
 [mypy-scrapy.utils.response]
 ignore_errors = True
 
-[mypy-scrapy.utils.spider]
-ignore_errors = True
-
 [mypy-scrapy.utils.trackref]
 ignore_errors = True
 

From 0a93df9efd20a4bcd34d2ee5e6bdf6d365d70409 Mon Sep 17 00:00:00 2001
From: Eugenio Lacuesta <eugenio.lacuesta@gmail.com>
Date: Mon, 23 Nov 2020 16:16:18 -0300
Subject: [PATCH 2/3] Move collect_asyncgen to utils.asyncgen

---
 scrapy/utils/asyncgen.py | 5 +++++
 scrapy/utils/py36.py     | 4 ++--
 scrapy/utils/python.py   | 7 -------
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 scrapy/utils/asyncgen.py

diff --git a/scrapy/utils/asyncgen.py b/scrapy/utils/asyncgen.py
new file mode 100644
index 000000000..7f697af5f
--- /dev/null
+++ b/scrapy/utils/asyncgen.py
@@ -0,0 +1,5 @@
+async def collect_asyncgen(result):
+    results = []
+    async for x in result:
+        results.append(x)
+    return results
diff --git a/scrapy/utils/py36.py b/scrapy/utils/py36.py
index 070b145a4..653e2bbbb 100644
--- a/scrapy/utils/py36.py
+++ b/scrapy/utils/py36.py
@@ -1,11 +1,11 @@
 import warnings
 
 from scrapy.exceptions import ScrapyDeprecationWarning
-from scrapy.utils.python import collect_asyncgen  # noqa: F401
+from scrapy.utils.asyncgen import collect_asyncgen  # noqa: F401
 
 
 warnings.warn(
-    "Module `scrapy.utils.py36` is deprecated, please import from `scrapy.utils.python` instead.",
+    "Module `scrapy.utils.py36` is deprecated, please import from `scrapy.utils.asyncgen` instead.",
     category=ScrapyDeprecationWarning,
     stacklevel=2,
 )
diff --git a/scrapy/utils/python.py b/scrapy/utils/python.py
index 7bd286523..5703fd4c3 100644
--- a/scrapy/utils/python.py
+++ b/scrapy/utils/python.py
@@ -355,10 +355,3 @@ class MutableChain:
     @deprecated("scrapy.utils.python.MutableChain.__next__")
     def next(self):
         return self.__next__()
-
-
-async def collect_asyncgen(result):
-    results = []
-    async for x in result:
-        results.append(x)
-    return results

From fe8bb6bd905ad2a733ba5e876f4197888605902e Mon Sep 17 00:00:00 2001
From: Eugenio Lacuesta <eugenio.lacuesta@gmail.com>
Date: Mon, 23 Nov 2020 16:51:04 -0300
Subject: [PATCH 3/3] Fix import

---
 scrapy/utils/spider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scrapy/utils/spider.py b/scrapy/utils/spider.py
index 5319604ba..59fc9202f 100644
--- a/scrapy/utils/spider.py
+++ b/scrapy/utils/spider.py
@@ -4,7 +4,7 @@ import logging
 from scrapy.spiders import Spider
 from scrapy.utils.defer import deferred_from_coro
 from scrapy.utils.misc import arg_to_iter
-from scrapy.utils.python import collect_asyncgen
+from scrapy.utils.asyncgen import collect_asyncgen
 
 
 logger = logging.getLogger(__name__)