Merge pull request #3047 from RonnyPfannschmidt/mark-newapi

move node base classes from main to nodes

Author: nicoddemus

_pytest/fixtures.py

@@ -26,11 +26,12 @@
 
 def pytest_sessionstart(session):
     import _pytest.python
+    import _pytest.nodes
 
     scopename2class.update({
         'class': _pytest.python.Class,
         'module': _pytest.python.Module,
-        'function': _pytest.main.Item,
+        'function': _pytest.nodes.Item,
         'session': _pytest.main.Session,
     })
     session._fixturemanager = FixtureManager(session)

_pytest/hookspec.py

@@ -153,7 +153,7 @@ def pytest_collection_modifyitems(session, config, items):
 
     :param _pytest.main.Session session: the pytest session object
     :param _pytest.config.Config config: pytest config object
-    :param List[_pytest.main.Item] items: list of item objects
+    :param List[_pytest.nodes.Item] items: list of item objects
     """