adapt to new import locations

xdist/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '1.5a6'
+__version__ = '1.5a7'

xdist/looponfail.py

@@ -119,7 +119,7 @@ def init_slave_session(channel, args, option_dict):
     sys.path[:] = newpaths
 
     #fullwidth, hasmarkup = channel.receive()
-    from pytest.plugin.config import Config
+    from _pytest.config import Config
     config = Config()
     config.option.__dict__.update(option_dict)
     config._preparse(args)

xdist/plugin.py

@@ -236,7 +236,7 @@ def pytest_runtest_protocol(item):
 def forked_run_report(item):
     # for now, we run setup/teardown in the subprocess
     # XXX optionally allow sharing of setup/teardown
-    from pytest.plugin.runner import runtestprotocol
+    from _pytest.runner import runtestprotocol
     EXITSTATUS_TESTEXIT = 4
     import marshal
     from xdist.remote import serialize_report
@@ -262,7 +262,7 @@ def report_process_crash(item, result):
     path, lineno = item._getfslineno()
     info = "%s:%s: running the test CRASHED with signal %d" %(
             path, lineno, result.signal)
-    from pytest.plugin import runner
+    from _pytest import runner
     call = runner.CallInfo(lambda: 0/0, "???")
     call.excinfo = info
     rep = runner.pytest_runtest_makereport(item, call)

xdist/remote.py

@@ -105,7 +105,7 @@ def getinfodict():
     )
 
 def remote_initconfig(option_dict, args):
-    from pytest.plugin.config import Config
+    from _pytest.config import Config
     config = Config()
     config.pluginmanager.unregister(name="terminal")
     config._preparse(args, addopts=False)

xdist/slavemanage.py

@@ -3,7 +3,7 @@ import sys, os
 import execnet
 import xdist.remote
 
-from pytest.plugin import runner # XXX load dynamically
+from _pytest import runner # XXX load dynamically
 
 class NodeManager(object):
     def __init__(self, config, specs=None):