[pypy-svn] r39986 - in pypy/dist/pypy/translator/js/examples/console: . test

[fijal at codespeak.net]

Author: fijal
Date: Tue Mar  6 15:03:43 2007
New Revision: 39986

Modified:
   pypy/dist/pypy/translator/js/examples/console/session.py
   pypy/dist/pypy/translator/js/examples/console/test/test_session.py
Log:
(fijal, arigo) - New strange py.__.net interface for those. Less code :)


Modified: pypy/dist/pypy/translator/js/examples/console/session.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/session.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/session.py	Tue Mar  6 15:03:43 2007
@@ -13,8 +13,7 @@
 import py
 import subprocess
 from Queue import Queue
-from py.__.net.greensock2 import autogreenlet, Timer, wait, meetingpoint,\
-     Interrupted
+from py.__.net.greensock2 import autogreenlet, Timer, Interrupted
 from py.__.net.pipe.fd import FDInput
     
 class Interpreter(object):
@@ -23,7 +22,7 @@
                             stdin=subprocess.PIPE, stderr=subprocess.STDOUT,
                             close_fds=True, bufsize=0)
         self.pipe = pipe
-        self.read_fd = FDInput(self.pipe.stdout.fileno())
+        self.read_fd = FDInput(self.pipe.stdout.fileno(), close=False)
         self.pid = pipe.pid
         self.timeout = timeout
 

Modified: pypy/dist/pypy/translator/js/examples/console/test/test_session.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/test/test_session.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/test/test_session.py	Tue Mar  6 15:03:43 2007
@@ -4,7 +4,7 @@
 
 import py
 
-from py.__.net.greensock2 import autogreenlet, wait, sleep, ConnexionClosed
+from py.__.net.greensock2 import allof
 from py.__.net.pipe.fd import FDInput
 from pypy.translator.js.examples.console.session import Interpreter
 
@@ -22,16 +22,12 @@
         pass
     while not i2.interact().endswith(">>> "):
         pass
-    l = []
 
     def f():
-        l.append(i.interact("import time;time.sleep(1)\n"))
+        return i.interact("import time;time.sleep(1)\n")
     def g():
-        l.append(i2.interact("a\n"))
+        return i2.interact("a\n")
 
-    g_f = autogreenlet(f)
-    g_g = autogreenlet(g)
-    wait(g_g)
-    wait(g_f)
-    assert len(l) == 2
-    assert l[1].startswith(">>")
+    one, two = allof(g, f)
+    assert two.startswith(">>")
+    assert one.startswith("Traceback")