some more separation of core pluginmanager from pytest specific functionality.

Idea is to have the PluginManager be re-useable from other projects at some point.

1 files changed, 8 insertions, 6 deletions

diff --git a/pytest.py b/pytest.py
index 9897780b2..6c25c6195 100644
--- a/pytest.py
+++ b/pytest.py
@@ -8,9 +8,11 @@ if __name__ == '__main__': # if run as a script or by 'python -m pytest'
     # we trigger the below "else" condition by the following import
     import pytest
     raise SystemExit(pytest.main())
-else:
-    # we are simply imported
-    from _pytest.core import main, UsageError, _preloadplugins
-    from _pytest import core as cmdline
-    from _pytest import __version__
-    _preloadplugins() # to populate pytest.* namespace so help(pytest) works
+
+# else we are imported
+
+from _pytest.config import main, UsageError, _preloadplugins, cmdline
+from _pytest import __version__
+
+_preloadplugins() # to populate pytest.* namespace so help(pytest) works
+