[pypy-svn] r59738 - in pypy/trunk/pypy/translator/js/examples: . console console/test test

[hpk at codespeak.net]

Author: hpk
Date: Wed Nov  5 20:05:17 2008
New Revision: 59738

Modified:
   pypy/trunk/pypy/translator/js/examples/console/console.py
   pypy/trunk/pypy/translator/js/examples/console/session.py
   pypy/trunk/pypy/translator/js/examples/console/test/test_console.py
   pypy/trunk/pypy/translator/js/examples/console/test/test_session.py
   pypy/trunk/pypy/translator/js/examples/overmind.py
   pypy/trunk/pypy/translator/js/examples/test/test_examples.py
Log:
fixed errros due earlier to "py.__.green" -> pygreen renaming. 
pygreen currently lives in svn/py/trunk/contrib. 
Shall we put this as yet another external into pypy/lib? 



Modified: pypy/trunk/pypy/translator/js/examples/console/console.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/console/console.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/console/console.py	Wed Nov  5 20:05:17 2008
@@ -6,8 +6,8 @@
 from pypy.translator.js import commproxy
 from pypy.translator.js.examples.console.session import Interpreter, Killed
 from pypy.translator.js.examples.console.docloader import DocLoader
-from py.__.green.server.httpserver import GreenHTTPServer
-from py.__.green.greensock2 import ConnexionClosed
+from pygreen.server.httpserver import GreenHTTPServer
+from pygreen.greensock2 import ConnexionClosed
 
 commproxy.USE_MOCHIKIT = True
 

Modified: pypy/trunk/pypy/translator/js/examples/console/session.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/console/session.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/console/session.py	Wed Nov  5 20:05:17 2008
@@ -14,9 +14,9 @@
 import py
 import subprocess
 from Queue import Queue
-from py.__.green.greensock2 import autogreenlet, Timer, Interrupted,\
+from pygreen.greensock2 import autogreenlet, Timer, Interrupted,\
      meetingpoint
-from py.__.green.pipe.fd import FDInput
+from pygreen.pipe.fd import FDInput
 from py.magic import greenlet
 import time
 

Modified: pypy/trunk/pypy/translator/js/examples/console/test/test_console.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/console/test/test_console.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/console/test/test_console.py	Wed Nov  5 20:05:17 2008
@@ -1,5 +1,6 @@
 
 import py
+py.test.importorskip("pygreen")
 
 def test_line_skip():
     from pypy.translator.js.examples.console.console import line_split

Modified: pypy/trunk/pypy/translator/js/examples/console/test/test_session.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/console/test/test_session.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/console/test/test_session.py	Wed Nov  5 20:05:17 2008
@@ -2,15 +2,16 @@
 """ Various tests around interpreter in a subprocess
 """
 
+import sys
 import py
 
-from py.__.green.greensock2 import allof, sleep
-from py.__.green.pipe.fd import FDInput
-from pypy.translator.js.examples.console.session import Interpreter, Killed
-
-import sys
 if sys.platform == 'nt':
     py.test.skip("Those tests doesn't run on windows (yet)")
+py.test.importorskip("pygreen") 
+from pygreen.greensock2 import allof, sleep
+from pygreen.pipe.fd import FDInput
+from pypy.translator.js.examples.console.session import Interpreter, Killed
+
 
 def test_greensock_reader_timeouter():
     i = Interpreter("python", timeout=3)

Modified: pypy/trunk/pypy/translator/js/examples/overmind.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/overmind.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/overmind.py	Wed Nov  5 20:05:17 2008
@@ -10,7 +10,7 @@
 from pypy.rpython.ootypesystem.bltregistry import described
 from pypy.translator.js.main import rpython2javascript
 from pypy.translator.js.examples.console import console
-from py.__.green.server.httpserver import GreenHTTPServer
+from pygreen.server.httpserver import GreenHTTPServer
 
 import os
 import py

Modified: pypy/trunk/pypy/translator/js/examples/test/test_examples.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/test/test_examples.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/test/test_examples.py	Wed Nov  5 20:05:17 2008
@@ -2,6 +2,7 @@
 """ Various build tests
 """
 import py
+py.test.importorskip("pygreen")
 from pypy.translator.js.main import rpython2javascript
 
 def test_console_build():