[pypy-svn] r37799 - pypy/dist/pypy/translator/js/demo/jsdemo

Fri Feb 2 12:52:55 CET 2007

Author: fijal
Date: Fri Feb  2 12:52:53 2007
New Revision: 37799

Modified:
   pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
   pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py
   pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py
Log:
Add _callable instead of simple lambdas


Modified: pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
==============================================================================

--- pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py	(original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py	Fri Feb  2 12:52:53 2007
@@ -68,8 +68,6 @@
         self.seen = set()
         return to_ret
 
-lambda_None = _callable([])
-
 # Needed double inheritance for both server job
 # and semi-transparent communication proxy
 class BnbRoot(Root, BasicExternal):
@@ -90,12 +88,12 @@
     _render_xmlhttp = True
     
     _methods = {
-        'get_message'  : MethodDesc( [('player_id', int), ('keys' , str), ('callback', lambda_None)] , {str:[{str:str}]}),
-        'add_player'   : MethodDesc( [('player_id', int), ('callback', lambda_None)] , {str:[{str:str}]}),
-        'remove_player': MethodDesc( [('player_id', int), ('callback', lambda_None)] , {str:[{str:str}]}),
-        'player_name'  : MethodDesc( [('player_id', int), ('name', str), ('callback', lambda_None)] , {str:[{str:str}]}),
+        'get_message'  : MethodDesc( [('player_id', int), ('keys' , str), ('callback', _callable([{str:[{str:str}]}]))] , {str:[{str:str}]}),
+        'add_player'   : MethodDesc( [('player_id', int), ('callback', _callable([{str:[{str:str}]}]))] , {str:[{str:str}]}),
+        'remove_player': MethodDesc( [('player_id', int), ('callback', _callable([{str:[{str:str}]}]))] , {str:[{str:str}]}),
+        'player_name'  : MethodDesc( [('player_id', int), ('name', str), ('callback', _callable([{str:[{str:str}]}]))] , {str:[{str:str}]}),
 #        'key'          : MethodDesc( [('player_id', 0), ('keynum', '0'), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
-        'initialize_session' : MethodDesc( [('callback', lambda_None)], {str:str}),
+        'initialize_session' : MethodDesc( [('callback', _callable([{str:str}]))], {str:str}),
     }
     
     def add_player(self, player_id = 0):

Modified: pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py	(original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py	Fri Feb  2 12:52:53 2007
@@ -5,7 +5,7 @@
 import autopath
 
 from pypy.translator.js.test.runtest import compile_function
-from pypy.translator.js.modules import dom,xmlhttp
+from pypy.translator.js.modules import dom
 from pypy.translator.js.modules.dom import document
 
 import thread
@@ -24,7 +24,7 @@
 def esc_html(data):
     return data.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;") \
            .replace("\n", "<br/>").replace(" ", "&nbsp;")
-    
+
 class Root(controllers.Root):
     def __init__(self):
         self.lock = thread.allocate_lock()

Modified: pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py	(original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py	Fri Feb  2 12:52:53 2007
@@ -21,9 +21,8 @@
 
 commproxy.USE_MOCHIKIT = True
 
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-#from SimpleHTTPServer import SimpleHTTPRequestHandler
-
+from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+from SocketServer import ThreadingMixIn
 
 HTML_PAGE = """
 <html>

