[svn r63600] merge remaining content of event.py into runner.py.

--HG--
branch : trunk

py/test/dist/dsession.py

@@ -5,7 +5,7 @@
 """
 
 import py
-from py.__.test.runner import basic_run_report, basic_collect_report
+from py.__.test.runner import basic_run_report, basic_collect_report, ItemTestReport
 from py.__.test.session import Session
 from py.__.test import outcome 
 from py.__.test.dist.nodemanage import NodeManager
@@ -236,9 +236,8 @@ class DSession(Session):
         self.node2pending[node].remove(item)
 
     def handle_crashitem(self, item, node):
-        from py.__.test import event
         longrepr = "!!! Node %r crashed during running of test %r" %(node, item)
-        rep = event.ItemTestReport(item, when="???", excinfo=longrepr)
+        rep = ItemTestReport(item, when="???", excinfo=longrepr)
         rep.node = node
         self.bus.notify("itemtestreport", rep)
 

py/test/dist/testing/test_dsession.py

@@ -1,6 +1,5 @@
 from py.__.test.dist.dsession import DSession
 from py.__.test.runner import basic_collect_report 
-from py.__.test import event
 from py.__.test import outcome
 import py
 

py/test/dist/testing/test_nodemanage.py

@@ -5,8 +5,6 @@
 import py
 from py.__.test.dist.nodemanage import NodeManager
 
-from py.__.test import event
-
 def pytest_funcarg__source(pyfuncitem):
     return py.test.ensuretemp(pyfuncitem.getmodpath()).mkdir("source")
 def pytest_funcarg__dest(pyfuncitem):