Revert "Node from parent (pytest-dev#5975)"

This reverts commit a3c8246, reversing
changes made to 886b8d2.

Ref: pytest-dev#5975 (comment)

Conflicts:
	src/_pytest/main.py
	src/_pytest/unittest.py

Squashed:

7c4b8a0  Revert "Node from parent (pytest-dev#5975)"
89abdb9  keep test, warning
c9062ed  warn via NodeMeta
149bddb  keep/adjust testing/test_mark.py:1013::test_addmarker_order
de91222  tests: handle DefinitionMock
9e3b17f  fix testing/test_collection.py:453::TestSession::test_parsearg

Conflicts:

    both modified:   src/_pytest/nodes.py
    both modified:   src/_pytest/python.py

doc/en/deprecations.rst

@@ -19,16 +19,6 @@ Below is a complete list of all pytest features which are considered deprecated.
 :class:`_pytest.warning_types.PytestWarning` or subclasses, which can be filtered using
 :ref:`standard warning filters <warnings>`.
 
-
-Node Construction changed to ``Node.from_parent``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.3
-
-The construction of nodes new should use the named constructor ``from_parent``.
-This limitation in api surface intends to enable better/simpler refactoring of the collection tree.
-
-
 ``junit_family`` default value change to "xunit2"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

doc/en/example/nonpython/conftest.py

@@ -4,7 +4,7 @@
 
 def pytest_collect_file(parent, path):
     if path.ext == ".yaml" and path.basename.startswith("test"):
-        return YamlFile.from_parent(parent, fspath=path)
+        return YamlFile(path, parent)
 
 
 class YamlFile(pytest.File):
@@ -13,7 +13,7 @@ def collect(self):
 
         raw = yaml.safe_load(self.fspath.open())
         for name, spec in sorted(raw.items()):
-            yield YamlItem.from_parent(self, name=name, spec=spec)
+            yield YamlItem(name, self, spec)
 
 
 class YamlItem(pytest.Item):

src/_pytest/doctest.py

@@ -111,9 +111,9 @@ def pytest_collect_file(path, parent):
     config = parent.config
     if path.ext == ".py":
         if config.option.doctestmodules and not _is_setup_py(config, path, parent):
-            return DoctestModule.from_parent(parent, fspath=path)
+            return DoctestModule(path, parent)
     elif _is_doctest(config, path, parent):
-        return DoctestTextfile.from_parent(parent, fspath=path)
+        return DoctestTextfile(path, parent)
 
 
 def _is_setup_py(config, path, parent):
@@ -220,10 +220,6 @@ def __init__(self, name, parent, runner=None, dtest=None):
         self.obj = None
         self.fixture_request = None
 
-    @classmethod
-    def from_parent(cls, parent, *, name, runner, dtest):
-        return cls._create(name=name, parent=parent, runner=runner, dtest=dtest)
-
     def setup(self):
         if self.dtest is not None:
             self.fixture_request = _setup_fixtures(self)
@@ -382,9 +378,7 @@ def collect(self):
         parser = doctest.DocTestParser()
         test = parser.get_doctest(text, globs, name, filename, 0)
         if test.examples:
-            yield DoctestItem.from_parent(
-                self, name=test.name, runner=runner, dtest=test
-            )
+            yield DoctestItem(test.name, self, runner, test)
 
 
 def _check_all_skipped(test):
@@ -493,9 +487,7 @@ def _find(
 
         for test in finder.find(module, module.__name__):
             if test.examples:  # skip empty doctests
-                yield DoctestItem.from_parent(
-                    self, name=test.name, runner=runner, dtest=test
-                )
+                yield DoctestItem(test.name, self, runner, test)
 
 
 def _setup_fixtures(doctest_item):

src/_pytest/main.py

@@ -203,7 +203,7 @@ def wrap_session(
     config: Config, doit: Callable[[Config, "Session"], Optional[Union[int, ExitCode]]]
 ) -> Union[int, ExitCode]:
     """Skeleton command line program"""
-    session = Session.from_config(config)
+    session = Session(config)
     session.exitstatus = ExitCode.OK
     initstate = 0
     try:
@@ -424,10 +424,6 @@ def __init__(self, config: Config) -> None:
 
         self._deselected = []  # type: List[nodes.Item]
 
-    @classmethod
-    def from_config(cls, config):
-        return cls._create(config)
-
     def __repr__(self):
         return "<%s %s exitstatus=%r testsfailed=%d testscollected=%d>" % (
             self.__class__.__name__,

src/_pytest/nodes.py

@@ -1,3 +1,4 @@
+import inspect
 import os
 import warnings
 from functools import lru_cache
@@ -77,12 +78,27 @@ def ischildnode(baseid, nodeid):
 
 
 class NodeMeta(type):
-    def __call__(self, *k, **kw):
-        warnings.warn(NODE_USE_FROM_PARENT.format(name=self.__name__), stacklevel=2)
-        return super().__call__(*k, **kw)
+    def __call__(cls, *args, **kwargs):
+        from _pytest.main import Session  # noqa: F811
 
-    def _create(self, *k, **kw):
-        return super().__call__(*k, **kw)
+        sig = inspect.signature(cls.__init__)
+        bsig = sig.bind(cls, *args, **kwargs)
+
+        if cls is Session:
+            # from_config
+            assert isinstance(bsig.arguments["config"], Config), (args, kwargs)
+            assert len(bsig.arguments) == 2, bsig  # self, config
+        else:
+            # from_parent
+            # TODO: assert hierarchy?
+            if "parent" not in bsig.arguments:
+                # XXX: handle DefinitionMock from tests.  Could also go through
+                # _create instead (or get fixed?)?
+                if not getattr(cls, "_pytest_skip_ctor_check", False):
+                    warnings.warn(
+                        NODE_USE_FROM_PARENT.format(name=cls.__name__), stacklevel=2
+                    )
+        return super().__call__(*args, **kwargs)
 
 
 class Node(metaclass=NodeMeta):
@@ -145,10 +161,6 @@ def __init__(
             if self.name != "()":
                 self._nodeid += "::" + self.name
 
-    @classmethod
-    def from_parent(cls, parent, *, name):
-        return cls._create(parent=parent, name=name)
-
     @property
     def ihook(self):
         """ fspath sensitive hook proxy used to call pytest hooks"""

src/_pytest/pytester.py

@@ -807,7 +807,7 @@ def getnode(self, config, arg):
         :param arg: a :py:class:`py.path.local` instance of the file
 
         """
-        session = Session.from_config(config)
+        session = Session(config)
         assert "::" not in str(arg)
         p = py.path.local(arg)
         config.hook.pytest_sessionstart(session=session)
@@ -825,7 +825,7 @@ def getpathnode(self, path):
 
         """
         config = self.parseconfigure(path)
-        session = Session.from_config(config)
+        session = Session(config)
         x = session.fspath.bestrelpath(path)
         config.hook.pytest_sessionstart(session=session)
         res = session.perform_collect([x], genitems=False)[0]

src/_pytest/python.py

@@ -196,8 +196,8 @@ def path_matches_patterns(path, patterns):
 
 def pytest_pycollect_makemodule(path, parent):
     if path.basename == "__init__.py":
-        return Package.from_parent(parent, fspath=path)
-    return Module.from_parent(parent, fspath=path)
+        return Package(path, parent)
+    return Module(path, parent)
 
 
 @hookimpl(hookwrapper=True)
@@ -209,7 +209,7 @@ def pytest_pycollect_makeitem(collector, name, obj):
     # nothing was collected elsewhere, let's do it here
     if safe_isclass(obj):
         if collector.istestclass(obj, name):
-            outcome.force_result(Class.from_parent(collector, name=name, obj=obj))
+            outcome.force_result(Class(name, parent=collector))
     elif collector.istestfunction(obj, name):
         # mock seems to store unbound methods (issue473), normalize it
         obj = getattr(obj, "__func__", obj)
@@ -228,7 +228,7 @@ def pytest_pycollect_makeitem(collector, name, obj):
             )
         elif getattr(obj, "__test__", True):
             if is_generator(obj):
-                res = Function.from_parent(collector, name=name)
+                res = Function(name, parent=collector)
                 reason = "yield tests were removed in pytest 4.0 - {name} will be ignored".format(
                     name=name
                 )
@@ -395,7 +395,7 @@ def _genfunctions(self, name, funcobj):
         cls = clscol and clscol.obj or None
         fm = self.session._fixturemanager
 
-        definition = FunctionDefinition.from_parent(self, name=name, callobj=funcobj)
+        definition = FunctionDefinition(parent=self, name=name, callobj=funcobj)
         fixtureinfo = definition._fixtureinfo
 
         metafunc = Metafunc(
@@ -410,7 +410,7 @@ def _genfunctions(self, name, funcobj):
         self.ihook.pytest_generate_tests.call_extra(methods, dict(metafunc=metafunc))
 
         if not metafunc._calls:
-            yield Function.from_parent(self, name=name, fixtureinfo=fixtureinfo)
+            yield Function(name, parent=self, fixtureinfo=fixtureinfo)
         else:
             # add funcargs() as fixturedefs to fixtureinfo.arg2fixturedefs
             fixtures.add_funcarg_pseudo_fixture_def(self, metafunc, fm)
@@ -422,9 +422,9 @@ def _genfunctions(self, name, funcobj):
 
             for callspec in metafunc._calls:
                 subname = "{}[{}]".format(name, callspec.id)
-                yield Function.from_parent(
-                    self,
+                yield Function(
                     name=subname,
+                    parent=self,
                     callspec=callspec,
                     callobj=funcobj,
                     fixtureinfo=fixtureinfo,
@@ -624,7 +624,7 @@ def collect(self):
         if init_module.check(file=1) and path_matches_patterns(
             init_module, self.config.getini("python_files")
         ):
-            yield Module.from_parent(self, fspath=init_module)
+            yield Module(init_module, self)
         pkg_prefixes = set()
         for path in this_path.visit(rec=self._recurse, bf=True, sort=True):
             # We will visit our own __init__.py file, in which case we skip it.
@@ -675,10 +675,6 @@ def _get_first_non_fixture_func(obj, names):
 class Class(PyCollector):
     """ Collector for test methods. """
 
-    @classmethod
-    def from_parent(cls, parent, *, name, obj=None):
-        return cls._create(name=name, parent=parent)
-
     def collect(self):
         if not safe_getattr(self.obj, "__test__", True):
             return []
@@ -704,7 +700,7 @@ def collect(self):
         self._inject_setup_class_fixture()
         self._inject_setup_method_fixture()
 
-        return [Instance.from_parent(self, name="()")]
+        return [Instance(name="()", parent=self)]
 
     def _inject_setup_class_fixture(self):
         """Injects a hidden autouse, class scoped fixture into the collected class object
@@ -1467,10 +1463,6 @@ def __init__(
         #: .. versionadded:: 3.0
         self.originalname = originalname
 
-    @classmethod
-    def from_parent(cls, parent, **kw):
-        return cls._create(parent=parent, **kw)
-
     def _initrequest(self):
         self.funcargs = {}
         self._request = fixtures.FixtureRequest(self)

src/_pytest/unittest.py

@@ -24,7 +24,7 @@ def pytest_pycollect_makeitem(collector, name, obj):
     except Exception:
         return
     # yes, so let's collect it
-    return UnitTestCase.from_parent(collector, name=name, obj=obj)
+    return UnitTestCase(name, parent=collector)
 
 
 class UnitTestCase(Class):
@@ -52,16 +52,15 @@ def collect(self):
             if not getattr(x, "__test__", True):
                 continue
             funcobj = getimfunc(x)
-            yield TestCaseFunction.from_parent(self, name=name, callobj=funcobj)
+            yield TestCaseFunction(name, parent=self, callobj=funcobj)
             foundsomething = True
 
         if not foundsomething:
             runtest = getattr(self.obj, "runTest", None)
             if runtest is not None:
                 ut = sys.modules.get("twisted.trial.unittest", None)
                 if ut is None or runtest != ut.TestCase.runTest:
-                    # TODO: callobj consistency
-                    yield TestCaseFunction.from_parent(self, name="runTest")
+                    yield TestCaseFunction("runTest", parent=self)
 
     def _inject_setup_teardown_fixtures(self, cls):
         """Injects a hidden auto-use fixture to invoke setUpClass/setup_method and corresponding

testing/python/collect.py

@@ -281,10 +281,10 @@ def make_function(testdir, **kwargs):
         from _pytest.fixtures import FixtureManager
 
         config = testdir.parseconfigure()
-        session = testdir.Session.from_config(config)
+        session = testdir.Session(config)
         session._fixturemanager = FixtureManager(session)
 
-        return pytest.Function.from_parent(config=config, parent=session, **kwargs)
+        return pytest.Function(config=config, parent=session, **kwargs)
 
     def test_function_equality(self, testdir):
         def func1():
@@ -1025,7 +1025,7 @@ def reportinfo(self):
                     return "ABCDE", 42, "custom"
             def pytest_pycollect_makeitem(collector, name, obj):
                 if name == "test_func":
-                    return MyFunction.from_parent(name=name, parent=collector)
+                    return MyFunction(name, parent=collector)
         """
         )
         item = testdir.getitem("def test_func(): pass")

testing/python/integration.py

@@ -10,7 +10,7 @@ def test_funcarg_non_pycollectobj(self, testdir):  # rough jstests usage
             import pytest
             def pytest_pycollect_makeitem(collector, name, obj):
                 if name == "MyClass":
-                    return MyCollector.from_parent(collector, name=name)
+                    return MyCollector(name, parent=collector)
             class MyCollector(pytest.Collector):
                 def reportinfo(self):
                     return self.fspath, 3, "xyz"
@@ -40,7 +40,7 @@ def test_autouse_fixture(self, testdir):  # rough jstests usage
             import pytest
             def pytest_pycollect_makeitem(collector, name, obj):
                 if name == "MyClass":
-                    return MyCollector.from_parent(collector, name=name)
+                    return MyCollector(name, parent=collector)
             class MyCollector(pytest.Collector):
                 def reportinfo(self):
                     return self.fspath, 3, "xyz"

testing/python/metafunc.py

@@ -24,11 +24,12 @@ def __init__(self, names):
 
         @attr.s
         class DefinitionMock(python.FunctionDefinition):
+            _pytest_skip_ctor_check = True
             obj = attr.ib()
 
         names = fixtures.getfuncargnames(func)
         fixtureinfo = FixtureInfo(names)
-        definition = DefinitionMock._create(func)
+        definition = DefinitionMock(func)
         return python.Metafunc(definition, fixtureinfo, config)
 
     def test_no_funcargs(self):

testing/test_collection.py

@@ -79,7 +79,7 @@ class CustomFile(pytest.File):
                 pass
             def pytest_collect_file(path, parent):
                 if path.ext == ".xxx":
-                    return CustomFile.from_parent(fspath=path, parent=parent)
+                    return CustomFile(path, parent=parent)
         """
         )
         node = testdir.getpathnode(hello)
@@ -450,7 +450,7 @@ def test_parsearg(self, testdir):
         p.move(target)
         subdir.chdir()
         config = testdir.parseconfig(p.basename)
-        rcol = Session.from_config(config)
+        rcol = Session(config=config)
         assert rcol.fspath == subdir
         parts = rcol._parsearg(p.basename)
 
@@ -467,7 +467,7 @@ def test_collect_topdir(self, testdir):
         # XXX migrate to collectonly? (see below)
         config = testdir.parseconfig(id)
         topdir = testdir.tmpdir
-        rcol = Session.from_config(config)
+        rcol = Session(config)
         assert topdir == rcol.fspath
         # rootid = rcol.nodeid
         # root2 = rcol.perform_collect([rcol.nodeid], genitems=False)[0]

testing/test_mark.py

@@ -1014,7 +1014,7 @@ def test_addmarker_order():
     session.own_markers = []
     session.parent = None
     session.nodeid = ""
-    node = Node.from_parent(session, name="Test")
+    node = Node(parent=session, name="Test")
     node.add_marker("foo")
     node.add_marker("bar")
     node.add_marker("baz", append=False)

testing/test_pluginmanager.py

@@ -122,7 +122,7 @@ def pytest_plugin_registered(self):
     def test_hook_proxy(self, testdir):
         """Test the gethookproxy function(#2016)"""
         config = testdir.parseconfig()
-        session = Session.from_config(config)
+        session = Session(config)
         testdir.makepyfile(**{"tests/conftest.py": "", "tests/subdir/conftest.py": ""})
 
         conftest1 = testdir.tmpdir.join("tests/conftest.py")