From 9515dafb1cefef3b3730685a4d15e4267b71b7fa Mon Sep 17 00:00:00 2001 From: hpk Date: Sun, 18 Mar 2007 17:28:04 +0100 Subject: [PATCH] [svn r40705] move greenlet support objects to the "py/green" directory. --HG-- branch : trunk --- py/{net => green}/__init__.py | 0 py/{net => green}/greenexecnet.py | 10 +++++----- py/{net => green}/greensock2.py | 0 py/{net => green}/msgstruct.py | 0 py/{net => green}/pipe/__init__.py | 0 py/{net => green}/pipe/common.py | 2 +- py/{net => green}/pipe/fd.py | 2 +- py/{net => green}/pipe/gsocket.py | 2 +- py/{net => green}/pipe/mp.py | 2 +- py/{net => green}/pipelayer.py | 0 py/{net => green}/server/__init__.py | 0 py/{net => green}/server/httpserver.py | 4 ++-- py/{net => green}/test/test_greenexecnet.py | 2 +- py/{net => green}/test/test_greensock2.py | 2 +- py/{net => green}/test/test_pipelayer.py | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename py/{net => green}/__init__.py (100%) rename py/{net => green}/greenexecnet.py (96%) rename py/{net => green}/greensock2.py (100%) rename py/{net => green}/msgstruct.py (100%) rename py/{net => green}/pipe/__init__.py (100%) rename py/{net => green}/pipe/common.py (96%) rename py/{net => green}/pipe/fd.py (98%) rename py/{net => green}/pipe/gsocket.py (98%) rename py/{net => green}/pipe/mp.py (91%) rename py/{net => green}/pipelayer.py (100%) rename py/{net => green}/server/__init__.py (100%) rename py/{net => green}/server/httpserver.py (94%) rename py/{net => green}/test/test_greenexecnet.py (96%) rename py/{net => green}/test/test_greensock2.py (99%) rename py/{net => green}/test/test_pipelayer.py (98%) diff --git a/py/net/__init__.py b/py/green/__init__.py similarity index 100% rename from py/net/__init__.py rename to py/green/__init__.py diff --git a/py/net/greenexecnet.py b/py/green/greenexecnet.py similarity index 96% rename from py/net/greenexecnet.py rename to py/green/greenexecnet.py index 7c5e2d882..93ef52fa9 100644 --- a/py/net/greenexecnet.py +++ b/py/green/greenexecnet.py @@ -13,8 +13,8 @@ There are some features lacking, most notable: """ import sys, os, py, inspect -from py.__.net import greensock2 -from py.__.net.msgstruct import message, decodemessage +from py.__.green import greensock2 +from py.__.green.msgstruct import message, decodemessage MSG_REMOTE_EXEC = 'r' MSG_OBJECT = 'o' @@ -163,7 +163,7 @@ class PopenCmdGateway(Gateway): action = "exec input()" def __init__(self, cmdline): - from py.__.net.pipe.fd import FDInput, FDOutput + from py.__.green.pipe.fd import FDInput, FDOutput child_in, child_out = os.popen2(cmdline, 't', 0) fdin = FDInput(child_out.fileno(), child_out.close) fdout = FDOutput(child_in.fileno(), child_in.close) @@ -173,14 +173,14 @@ class PopenCmdGateway(Gateway): def get_bootstrap_code(): # XXX assumes that the py lib is installed on the remote side src = [] - src.append('from py.__.net import greenexecnet') + src.append('from py.__.green import greenexecnet') src.append('greenexecnet.PopenCmdGateway.run_server()') src.append('') return '%r\n' % ('\n'.join(src),) get_bootstrap_code = staticmethod(get_bootstrap_code) def run_server(): - from py.__.net.pipe.fd import FDInput, FDOutput + from py.__.green.pipe.fd import FDInput, FDOutput gw = Gateway(input = FDInput(os.dup(0)), output = FDOutput(os.dup(1)), is_remote = True) diff --git a/py/net/greensock2.py b/py/green/greensock2.py similarity index 100% rename from py/net/greensock2.py rename to py/green/greensock2.py diff --git a/py/net/msgstruct.py b/py/green/msgstruct.py similarity index 100% rename from py/net/msgstruct.py rename to py/green/msgstruct.py diff --git a/py/net/pipe/__init__.py b/py/green/pipe/__init__.py similarity index 100% rename from py/net/pipe/__init__.py rename to py/green/pipe/__init__.py diff --git a/py/net/pipe/common.py b/py/green/pipe/common.py similarity index 96% rename from py/net/pipe/common.py rename to py/green/pipe/common.py index ba0aa7a29..975b60be3 100644 --- a/py/net/pipe/common.py +++ b/py/green/pipe/common.py @@ -1,4 +1,4 @@ -from py.__.net import greensock2 +from py.__.green import greensock2 VERBOSE = True diff --git a/py/net/pipe/fd.py b/py/green/pipe/fd.py similarity index 98% rename from py/net/pipe/fd.py rename to py/green/pipe/fd.py index 28b3ec3c3..0a3154436 100644 --- a/py/net/pipe/fd.py +++ b/py/green/pipe/fd.py @@ -1,5 +1,5 @@ import os -from py.__.net import greensock2 +from py.__.green import greensock2 class FDInput(object): diff --git a/py/net/pipe/gsocket.py b/py/green/pipe/gsocket.py similarity index 98% rename from py/net/pipe/gsocket.py rename to py/green/pipe/gsocket.py index a3f6d7e20..2264d5d94 100644 --- a/py/net/pipe/gsocket.py +++ b/py/green/pipe/gsocket.py @@ -1,4 +1,4 @@ -from py.__.net import greensock2 +from py.__.green import greensock2 import socket, errno, os error = socket.error diff --git a/py/net/pipe/mp.py b/py/green/pipe/mp.py similarity index 91% rename from py/net/pipe/mp.py rename to py/green/pipe/mp.py index f67171681..b03551a1e 100644 --- a/py/net/pipe/mp.py +++ b/py/green/pipe/mp.py @@ -1,4 +1,4 @@ -from py.__.net.pipe.common import BufferedInput +from py.__.green.pipe.common import BufferedInput class MeetingPointInput(BufferedInput): diff --git a/py/net/pipelayer.py b/py/green/pipelayer.py similarity index 100% rename from py/net/pipelayer.py rename to py/green/pipelayer.py diff --git a/py/net/server/__init__.py b/py/green/server/__init__.py similarity index 100% rename from py/net/server/__init__.py rename to py/green/server/__init__.py diff --git a/py/net/server/httpserver.py b/py/green/server/httpserver.py similarity index 94% rename from py/net/server/httpserver.py rename to py/green/server/httpserver.py index 57c55d8a9..844e9469b 100644 --- a/py/net/server/httpserver.py +++ b/py/green/server/httpserver.py @@ -1,6 +1,6 @@ import BaseHTTPServer -from py.__.net import greensock2 -from py.__.net.pipe.gsocket import GreenSocket +from py.__.green import greensock2 +from py.__.green.pipe.gsocket import GreenSocket class GreenMixIn: diff --git a/py/net/test/test_greenexecnet.py b/py/green/test/test_greenexecnet.py similarity index 96% rename from py/net/test/test_greenexecnet.py rename to py/green/test/test_greenexecnet.py index bfac4e2e3..731ffc424 100644 --- a/py/net/test/test_greenexecnet.py +++ b/py/green/test/test_greenexecnet.py @@ -1,5 +1,5 @@ import py -from py.__.net.greenexecnet import * +from py.__.green.greenexecnet import * def test_simple(): gw = PopenGateway() diff --git a/py/net/test/test_greensock2.py b/py/green/test/test_greensock2.py similarity index 99% rename from py/net/test/test_greensock2.py rename to py/green/test/test_greensock2.py index f11529b77..d1b610e6a 100644 --- a/py/net/test/test_greensock2.py +++ b/py/green/test/test_greensock2.py @@ -1,6 +1,6 @@ import py from socket import * -from py.__.net.greensock2 import * +from py.__.green.greensock2 import * def test_meetingpoint(): giv1, acc1 = meetingpoint() diff --git a/py/net/test/test_pipelayer.py b/py/green/test/test_pipelayer.py similarity index 98% rename from py/net/test/test_pipelayer.py rename to py/green/test/test_pipelayer.py index 437f87d28..76b53a200 100644 --- a/py/net/test/test_pipelayer.py +++ b/py/green/test/test_pipelayer.py @@ -1,5 +1,5 @@ import os, random -from py.__.net.pipelayer import PipeLayer, pipe_over_udp, PipeOverUdp +from py.__.green.pipelayer import PipeLayer, pipe_over_udp, PipeOverUdp def test_simple(): data1 = os.urandom(1000)