[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/real. Replace more calls with JSFunctionProxy

[Justas Sadzevičius]

Log message for revision 80236:
  Replace more calls with JSFunctionProxy
  

Changed:
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.js
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.py

-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.js
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.js	2007-09-27 15:39:49 UTC (rev 80235)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.js	2007-09-27 15:50:02 UTC (rev 80236)
@@ -25,7 +25,7 @@
         debug_tokens.push(tb_tokens[tb_next_token].tagName);
         tokens.push(tb_next_token++);
     }
-    return tokens.toSource();
+    return tokens;
 }
 
 function tb_extract_token_attrs(tokens, attr) {
@@ -33,7 +33,7 @@
     for (var i in tokens) {
         attrs.push(tb_tokens[tokens[i]].getAttribute(attr));
     }
-    return attrs
+    return attrs;
 }
 
 function tb_get_link_by_predicate(predicate, index) {

Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-27 15:39:49 UTC (rev 80235)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-27 15:50:02 UTC (rev 80236)
@@ -310,8 +310,7 @@
         if name is not None:
             xpath += '[@name=%s]' % repr(name)
 
-        matching_tokens = simplejson.loads(self.execute(
-            'tb_xpath_tokens(%s)' % simplejson.dumps(xpath)))
+        matching_tokens = self.js.tb_xpath_tokens(xpath)
 
         if index is None and not any([id, name, action]):
             if len(matching_tokens) == 1: