adapt to new import locations

2010-11-13 11:12:19 +01:00
parent 8272a669a4
commit a0652e9d99
9 changed files with 20 additions and 14 deletions
--- a/testing/test_slavemanage.py
+++ b/testing/test_slavemanage.py
@@ -11,8 +11,8 @@ def pytest_funcarg__hookrecorder(request):

 def pytest_funcarg__hook(request):
    from xdist import newhooks
-    from pytest.main import HookRelay, PluginManager
-    from pytest import hookspec
+    from _pytest.core import HookRelay, PluginManager
+    from _pytest import hookspec
    return HookRelay([hookspec, newhooks], PluginManager())

 class pytest_funcarg__mysetup: