Replace deprecated ast.NameConstant usage and add tests

scrapy/utils/misc.py

@@ -264,7 +264,7 @@ def is_generator_with_return_value(callable: Callable) -> bool:
     def returns_none(return_node: ast.Return) -> bool:
         value = return_node.value
         return (
-            value is None or isinstance(value, ast.NameConstant) and value.value is None
+            value is None or isinstance(value, ast.Constant) and value.value is None
         )
 
     if inspect.isgeneratorfunction(callable):

tests/test_utils_misc/test_return_with_argument_inside_generator.py

@@ -2,6 +2,7 @@
 import warnings
 from functools import partial
 from unittest import mock
+import ast
 
 from scrapy.utils.misc import (
     is_generator_with_return_value,
@@ -70,11 +71,16 @@ def i1():
             yield url
             return 1
 
+        def j1():
+            yield 1
+            return ast.Return(value=ast.Constant(value=42))
+
         assert is_generator_with_return_value(top_level_return_something)
         assert is_generator_with_return_value(f1)
         assert is_generator_with_return_value(g1)
         assert is_generator_with_return_value(h1)
         assert is_generator_with_return_value(i1)
+        assert is_generator_with_return_value(j1)
 
         with warnings.catch_warnings(record=True) as w:
             warn_on_generator_with_return_value(None, top_level_return_something)
@@ -137,6 +143,12 @@ def k2():
         def l2():
             return
 
+        def m2():
+            return ast.Return(value=None)
+
+        def n2():
+            return ast.Return(value=ast.Constant(value=None))
+
         assert not is_generator_with_return_value(top_level_return_none)
         assert not is_generator_with_return_value(f2)
         assert not is_generator_with_return_value(g2)
@@ -145,6 +157,9 @@ def l2():
         assert not is_generator_with_return_value(j2)  # not recursive
         assert not is_generator_with_return_value(k2)  # not recursive
         assert not is_generator_with_return_value(l2)
+        assert not is_generator_with_return_value(m2)
+        assert not is_generator_with_return_value(n2)
+
 
         with warnings.catch_warnings(record=True) as w:
             warn_on_generator_with_return_value(None, top_level_return_none)