From a4618a9293c2adfbb410035adaf8ce1bbed46c10 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sat, 13 Nov 2021 14:54:30 +0200
Subject: [PATCH] Avoid using PyCollector - inherit from Module instead

PyCollector is technically private in pytest and might change/break.
The DescribeBlocks act like modules, so instead treat them as ones
directly.
---
 pytest_describe/plugin.py | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pytest_describe/plugin.py b/pytest_describe/plugin.py
index 1779f14..b90584b 100644
--- a/pytest_describe/plugin.py
+++ b/pytest_describe/plugin.py
@@ -1,6 +1,12 @@
 import sys
 import types
-from _pytest.python import PyCollector
+import pytest
+
+
+PYTEST_GTE_7_0 = (
+    hasattr(pytest, 'version_tuple') and pytest.version_tuple >= (7, 0)
+)
+PYTEST_GTE_5_4 = hasattr(pytest.Collector, 'from_parent')
 
 
 def trace_function(funcobj, *args, **kwargs):
@@ -55,19 +61,24 @@ def evaluate_shared_behavior(funcobj):
     return funcobj._shared_functions
 
 
-class DescribeBlock(PyCollector):
+class DescribeBlock(pytest.Module):
     """Module-like object representing the scope of a describe block"""
 
     @classmethod
     def from_parent(cls, parent, obj):
-        name = obj.__name__
-        try:
-            from_parent_super = super().from_parent
-        except AttributeError:  # PyTest < 5.4
-            self = cls(name, parent)
+        name = getattr(obj, '_mangled_name', obj.__name__)
+        nodeid = parent.nodeid + '::' + name
+        if PYTEST_GTE_7_0:
+            self = super().from_parent(
+                parent=parent, path=parent.path, nodeid=nodeid,
+            )
+        elif PYTEST_GTE_5_4:
+            self = super().from_parent(
+                parent=parent, fspath=parent.fspath, nodeid=nodeid,
+            )
         else:
-            self = from_parent_super(parent, name=name)
-        self._name = getattr(obj, '_mangled_name', name)
+            self = cls(parent=parent, fspath=parent.fspath, nodeid=nodeid)
+        self.name = name
         self.funcobj = obj
         return self
 
@@ -78,10 +89,6 @@ def collect(self):
     def _getobj(self):
         return self._importtestmodule()
 
-    def _makeid(self):
-        """Magic that makes fixtures local to each scope"""
-        return f'{self.parent.nodeid}::{self._name}'
-
     def _importtestmodule(self):
         """Import a describe block as if it was a module"""
         module = make_module_from_function(self.funcobj)
@@ -100,7 +107,7 @@ def classnamefilter(self, name):
         return False
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} {self._name!r}>"
+        return f"<{self.__class__.__name__} {self.name!r}>"
 
 
 def pytest_pycollect_makeitem(collector, name, obj):