[py-svn] r32168 - py/dist/py/test/rsession

[fijal at codespeak.net]

Author: fijal
Date: Mon Sep 11 17:36:19 2006
New Revision: 32168

Modified:
   py/dist/py/test/rsession/web.py
   py/dist/py/test/rsession/webjs.py
Log:
Added display of items. Fixed some escaping.


Modified: py/dist/py/test/rsession/web.py
==============================================================================
--- py/dist/py/test/rsession/web.py	(original)
+++ py/dist/py/test/rsession/web.py	Mon Sep 11 17:36:19 2006
@@ -22,8 +22,9 @@
 DATADIR = py.path.local(__file__).dirpath("webdata")
 
 def escape(s):
-    return s.replace("&", "&").replace("<", "<").replace(">", ">"). \
-        replace("'", "\\'").replace(" ", " ").replace("\n", "<br/>")
+    return s
+    #return s.replace("&", "&").replace("<", "<").replace(">", ">"). \
+    #    replace("'", "\\'").replace(" ", " ").replace("\n", "<br/>")
 
 try:
     from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal,\
@@ -242,6 +243,8 @@
     def run_jssource(self):
         if IMPORTED_PYPY:
             from py.__.test.rsession import webjs
+            
+            
             javascript_source = rpython2javascript(webjs, 
                 ["main", "show_skip", "show_traceback"], Options)
             self.serve_data("text/javascript", javascript_source)

Modified: py/dist/py/test/rsession/webjs.py
==============================================================================
--- py/dist/py/test/rsession/webjs.py	(original)
+++ py/dist/py/test/rsession/webjs.py	Mon Sep 11 17:36:19 2006
@@ -27,15 +27,17 @@
     if len(msglist) == 0:
         return
     for item in glob.pending[:]:
-        process(item)
+        if not process(item):
+            return
     glob.pending = []
     for msg in msglist:
-        process(msg)
+        if not process(msg):
+            return
     exported_methods.show_all_statuses(comeback)
 
 def process(msg):
     if len(msg) == 0:
-        return
+        return False
     elem = dom.get_document().getElementById("testmain")
     #elem.innerHTML += '%s<br/>' % msg['event']
     main_t = dom.get_document().getElementById("main_table")
@@ -56,7 +58,7 @@
             module_part = get_elem(msg['fullmodulename'])
             if not module_part:
                 glob.pending.append(msg)
-                return
+                return True
             td = create_elem("td")
             item_name = msg['fullitemname']
             # TODO: dispatch output
@@ -82,16 +84,22 @@
             module_part.appendChild(td)
         except:
             dom.get_document().getElementById("testmain").innerHTML += "some error"
+    return True
 
 def show_skip(item_name="a"):
-    set_msgbox(skips[item_name])
+    set_msgbox(item_name, skips[item_name])
 
-def set_msgbox(data):
+def set_msgbox(item_name, data):
     msgbox = get_elem("messagebox")
-    msgbox.innerHTML = data
+    while len(msgbox.childNodes):
+        msgbox.removeChild(msgbox.childNodes[0])
+    pre = create_elem("pre")
+    txt = create_text_elem(item_name + "\n" + data)
+    pre.appendChild(txt)
+    msgbox.appendChild(pre)
 
 def show_traceback(item_name="a"):
-    set_msgbox(tracebacks[item_name])
+    set_msgbox(item_name, tracebacks[item_name])
 
 def fail_come_back(msg):
     tracebacks[msg['item_name']] = msg['traceback']