diff --git a/py/path/gateway/channeltest.py b/py/path/gateway/channeltest.py index fdb46ab9b..9d77ef01f 100644 --- a/py/path/gateway/channeltest.py +++ b/py/path/gateway/channeltest.py @@ -25,7 +25,7 @@ class PathServer: def command_GET(self, id, spec): path = self.C2P[id] - self.channel.send(path.get(spec)) + self.channel.send(path._getbyspec(spec)) def command_READ(self, id): path = self.C2P[id] @@ -53,7 +53,7 @@ class PathServer: if __name__ == '__main__': import py gw = py.execnet.PopenGateway() - channel = gw.channelfactory.new() + channel = gw._channelfactory.new() srv = PathServer(channel) c = gw.remote_exec(""" import remotepath diff --git a/py/path/gateway/channeltest2.py b/py/path/gateway/channeltest2.py index f22026d04..f15ac94d1 100644 --- a/py/path/gateway/channeltest2.py +++ b/py/path/gateway/channeltest2.py @@ -13,8 +13,9 @@ channel.send(srv.p2c(py.path.local("/tmp"))) #gw = py.execnet.SshGateway('codespeak.net') gw = py.execnet.PopenGateway() -c = gw.remote_exec(SRC) -subchannel = gw.channelfactory.new() +gw.remote_init_threads(5) +c = gw.remote_exec(SRC, stdout=py.std.sys.stdout, stderr=py.std.sys.stderr) +subchannel = gw._channelfactory.new() c.send(subchannel) p = RemotePath(subchannel, c.receive()) diff --git a/py/path/gateway/remotepath.py b/py/path/gateway/remotepath.py index 5f5e538be..a8d8d8529 100644 --- a/py/path/gateway/remotepath.py +++ b/py/path/gateway/remotepath.py @@ -33,7 +33,7 @@ class RemotePath(common.FSPathBase): self._channel.send(('JOIN', self._id, id) + args) return RemotePath(self._channel, id) - def get(self, spec): + def _getbyspec(self, spec): parts = spec.split(',') ask = [x for x in parts if x not in self._specs] if ask: