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

[fijal at codespeak.net]

Author: fijal
Date: Sun Mar 18 19:28:11 2007
New Revision: 40718

Modified:
   pypy/dist/pypy/translator/js/examples/console/console.py
   pypy/dist/pypy/translator/js/examples/console/session.py
   pypy/dist/pypy/translator/js/examples/console/test/test_console.py
   pypy/dist/pypy/translator/js/examples/console/test/test_session.py
   pypy/dist/pypy/translator/js/examples/overmind.py
   pypy/dist/pypy/translator/js/examples/test/test_examples.py
Log:
Fix imports and unskip tests


Modified: pypy/dist/pypy/translator/js/examples/console/console.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/console.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/console.py	Sun Mar 18 19:28:11 2007
@@ -10,7 +10,7 @@
 from pypy.translator.js.lib.support import callback
 from pypy.translator.js import commproxy
 from pypy.translator.js.examples.console.session import Interpreter
-from py.__.net.server.httpserver import GreenHTTPServer
+from py.__.green.server.httpserver import GreenHTTPServer
 
 commproxy.USE_MOCHIKIT = True
 

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	Sun Mar 18 19:28:11 2007
@@ -13,8 +13,8 @@
 import py
 import subprocess
 from Queue import Queue
-from py.__.net.greensock2 import autogreenlet, Timer, Interrupted
-from py.__.net.pipe.fd import FDInput
+from py.__.green.greensock2 import autogreenlet, Timer, Interrupted
+from py.__.green.pipe.fd import FDInput
     
 class Interpreter(object):
     def __init__(self, python, timeout=TIMEOUT):

Modified: pypy/dist/pypy/translator/js/examples/console/test/test_console.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/test/test_console.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/test/test_console.py	Sun Mar 18 19:28:11 2007
@@ -1,6 +1,5 @@
 
 import py
-py.test.skip("Skip this till pylib trunk->dist merge")
 
 def test_line_skip():
     from pypy.translator.js.examples.console.console import line_split

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	Sun Mar 18 19:28:11 2007
@@ -3,10 +3,9 @@
 """
 
 import py
-py.test.skip("Skip this till pylib trunk->dist merge")
 
-from py.__.net.greensock2 import allof
-from py.__.net.pipe.fd import FDInput
+from py.__.green.greensock2 import allof
+from py.__.green.pipe.fd import FDInput
 from pypy.translator.js.examples.console.session import Interpreter
 
 def test_greensock_reader_timeouter():

Modified: pypy/dist/pypy/translator/js/examples/overmind.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/overmind.py	(original)
+++ pypy/dist/pypy/translator/js/examples/overmind.py	Sun Mar 18 19:28:11 2007
@@ -57,7 +57,7 @@
 if __name__ == '__main__':
     try:
         addr = ('', 8008)
-        from py.__.net.server.httpserver import GreenHTTPServer
+        from py.__.green.server.httpserver import GreenHTTPServer
         httpd = server.create_server(server_address=addr, handler=Handler,
                                      server=GreenHTTPServer)
         httpd.serve_forever()

Modified: pypy/dist/pypy/translator/js/examples/test/test_examples.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/test/test_examples.py	(original)
+++ pypy/dist/pypy/translator/js/examples/test/test_examples.py	Sun Mar 18 19:28:11 2007
@@ -2,7 +2,6 @@
 """ Various build tests
 """
 import py
-py.test.skip("Skip this till pylib trunk->dist merge")
 from pypy.translator.js.main import rpython2javascript
 
 def test_console_build():