[pypy-svn] r40981 - in pypy/dist/pypy/translator/js: examples/console lib

[fijal at codespeak.net]

Author: fijal
Date: Wed Mar 21 22:21:10 2007
New Revision: 40981

Modified:
   pypy/dist/pypy/translator/js/examples/console/console.py
   pypy/dist/pypy/translator/js/lib/support.py
Log:
Minor fixes.


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	Wed Mar 21 22:21:10 2007
@@ -15,13 +15,13 @@
 commproxy.USE_MOCHIKIT = True
 
 SNIPPETS = [
-    """from tputil import make_instance_proxy
+    """from tputil import make_proxy
 history = []
-def recorder(invocation):
-    history.append(invocation)
-    return invocation.perform()
+def recorder(operation):
+    history.append(operation) 
+    return operation.delegate()
 
-l = make_instance_proxy([], recorder)
+l = make_proxy(recorder, obj=[])
 """]
 
 FUNCTION_LIST = ["load_console", "console_onload", "execute_snippet"]

Modified: pypy/dist/pypy/translator/js/lib/support.py
==============================================================================
--- pypy/dist/pypy/translator/js/lib/support.py	(original)
+++ pypy/dist/pypy/translator/js/lib/support.py	Wed Mar 21 22:21:10 2007
@@ -17,7 +17,10 @@
         if defs is None:
             defs = ()
         vars = func.func_code.co_varnames[:func.func_code.co_argcount]
-        arg_list = load_dict_args(vars, defs, args)
+        if isinstance(args, dict):
+            arg_list = load_dict_args(vars, defs, args)
+        else:
+            arg_list = args
         arg_list.append(("callback", _callable(args=[retval])))
         func._method = (func.__name__, MethodDesc(arg_list, retval))
         return func