move node base classes from main to nodes

2017-12-17 15:19:01 +01:00
parent d87279115d
commit afc607cfd8
10 changed files with 386 additions and 379 deletions
--- a/testing/python/collect.py
+++ b/testing/python/collect.py
@@ -6,11 +6,8 @@ from textwrap import dedent
 import _pytest._code
 import py
 import pytest
-from _pytest.main import (
-    Collector,
-    EXIT_NOTESTSCOLLECTED
-)
-
+from _pytest.main import EXIT_NOTESTSCOLLECTED
+from _pytest.nodes import Collector

 ignore_parametrized_marks = pytest.mark.filterwarnings('ignore:Applying marks directly to parameters')