[svn r63160] rename masterslave -> txnode

--HG--
branch : trunk

py/test/dsession/nodemanage.py

@@ -1,8 +1,7 @@
 import py
 import sys, os
-from py.__.test.dsession.masterslave import MasterNode
+from py.__.test.dsession.txnode import MasterNode
 from py.__.execnet.gwmanage import GatewayManager
-from py.__.test import event
 
     
 class NodeManager(object):

py/test/dsession/testing/test_functional_dsession.py

@@ -1,6 +1,6 @@
 import py
 from py.__.test.dsession.dsession import DSession
-from test_masterslave import EventQueue
+from test_txnode import EventQueue
 
 class TestAsyncFunctional:
     def test_conftest_options(self, testdir):

py/test/dsession/testing/test_txnode.py

@@ -1,6 +1,6 @@
 
 import py
-from py.__.test.dsession.masterslave import MasterNode
+from py.__.test.dsession.txnode import MasterNode
 
 class EventQueue:
     def __init__(self, bus, queue=None):

py/test/dsession/txnode.py

@@ -67,7 +67,7 @@ class MasterNode(object):
 def install_slave(gateway, config):
     channel = gateway.remote_exec(source="""
         from py.__.test.dsession.mypickle import PickleChannel
-        from py.__.test.dsession.masterslave import SlaveNode
+        from py.__.test.dsession.txnode import SlaveNode
         channel = PickleChannel(channel)
         slavenode = SlaveNode(channel)
         slavenode.run()