Account for Python 3.7 in the 7.4.x branch

pytest-dev · Sep 7, 2023 · e7f94ed · e7f94ed
1 parent 3dc0657
commit e7f94ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/_pytest/doctest.py b/src/_pytest/doctest.py
@@ -545,7 +545,9 @@ def _from_module(self, module, object):
                     Here we override `_from_module` to check the underlying
                     function instead. https://github.com/python/cpython/issues/107995
                     """
-                    if isinstance(object, functools.cached_property):
+                    if hasattr(functools, "functools") and isinstance(
+                        object, functools.cached_property
+                    ):
                         object = object.func
 
                     # Type ignored because this is a private function.

diff --git a/testing/test_doctest.py b/testing/test_doctest.py
@@ -482,6 +482,9 @@ def test_doctestmodule(self, pytester: Pytester):
         reprec = pytester.inline_run(p, "--doctest-modules")
         reprec.assertoutcome(failed=1)
 
+    @pytest.mark.skipif(
+        sys.version_info[:2] <= (3, 7), reason="Only Python 3.7 or less"
+    )
     def test_doctest_cached_property(self, pytester: Pytester):
         p = pytester.makepyfile(
             """