[py-svn] r40705 - in py/trunk/py: green green/pipe green/server green/test net

[hpk at codespeak.net]

Author: hpk
Date: Sun Mar 18 17:28:04 2007
New Revision: 40705

Added:
   py/trunk/py/green/
      - copied from r40102, py/trunk/py/net/
Removed:
   py/trunk/py/net/
Modified:
   py/trunk/py/green/greenexecnet.py
   py/trunk/py/green/pipe/common.py
   py/trunk/py/green/pipe/fd.py
   py/trunk/py/green/pipe/gsocket.py
   py/trunk/py/green/pipe/mp.py
   py/trunk/py/green/server/httpserver.py
   py/trunk/py/green/test/test_greenexecnet.py
   py/trunk/py/green/test/test_greensock2.py
   py/trunk/py/green/test/test_pipelayer.py
Log:
move greenlet support objects to the "py/green" directory. 


Modified: py/trunk/py/green/greenexecnet.py
==============================================================================
--- py/trunk/py/net/greenexecnet.py	(original)
+++ py/trunk/py/green/greenexecnet.py	Sun Mar 18 17:28:04 2007
@@ -13,8 +13,8 @@
 """
 
 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 @@
     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 @@
     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)

Modified: py/trunk/py/green/pipe/common.py
==============================================================================
--- py/trunk/py/net/pipe/common.py	(original)
+++ py/trunk/py/green/pipe/common.py	Sun Mar 18 17:28:04 2007
@@ -1,4 +1,4 @@
-from py.__.net import greensock2
+from py.__.green import greensock2
 
 VERBOSE = True
 

Modified: py/trunk/py/green/pipe/fd.py
==============================================================================
--- py/trunk/py/net/pipe/fd.py	(original)
+++ py/trunk/py/green/pipe/fd.py	Sun Mar 18 17:28:04 2007
@@ -1,5 +1,5 @@
 import os
-from py.__.net import greensock2
+from py.__.green import greensock2
 
 
 class FDInput(object):

Modified: py/trunk/py/green/pipe/gsocket.py
==============================================================================
--- py/trunk/py/net/pipe/gsocket.py	(original)
+++ py/trunk/py/green/pipe/gsocket.py	Sun Mar 18 17:28:04 2007
@@ -1,4 +1,4 @@
-from py.__.net import greensock2
+from py.__.green import greensock2
 import socket, errno, os
 
 error = socket.error

Modified: py/trunk/py/green/pipe/mp.py
==============================================================================
--- py/trunk/py/net/pipe/mp.py	(original)
+++ py/trunk/py/green/pipe/mp.py	Sun Mar 18 17:28:04 2007
@@ -1,4 +1,4 @@
-from py.__.net.pipe.common import BufferedInput
+from py.__.green.pipe.common import BufferedInput
 
 
 class MeetingPointInput(BufferedInput):

Modified: py/trunk/py/green/server/httpserver.py
==============================================================================
--- py/trunk/py/net/server/httpserver.py	(original)
+++ py/trunk/py/green/server/httpserver.py	Sun Mar 18 17:28:04 2007
@@ -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:

Modified: py/trunk/py/green/test/test_greenexecnet.py
==============================================================================
--- py/trunk/py/net/test/test_greenexecnet.py	(original)
+++ py/trunk/py/green/test/test_greenexecnet.py	Sun Mar 18 17:28:04 2007
@@ -1,5 +1,5 @@
 import py
-from py.__.net.greenexecnet import *
+from py.__.green.greenexecnet import *
 
 def test_simple():
     gw = PopenGateway()

Modified: py/trunk/py/green/test/test_greensock2.py
==============================================================================
--- py/trunk/py/net/test/test_greensock2.py	(original)
+++ py/trunk/py/green/test/test_greensock2.py	Sun Mar 18 17:28:04 2007
@@ -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()

Modified: py/trunk/py/green/test/test_pipelayer.py
==============================================================================
--- py/trunk/py/net/test/test_pipelayer.py	(original)
+++ py/trunk/py/green/test/test_pipelayer.py	Sun Mar 18 17:28:04 2007
@@ -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)