[pypy-svn] r38648 - in pypy/extradoc/talk/warsaw2006: . src

fijal at codespeak.net fijal at codespeak.net
Mon Feb 12 23:43:59 CET 2007


Author: fijal
Date: Mon Feb 12 23:43:54 2007
New Revision: 38648

Modified:
   pypy/extradoc/talk/warsaw2006/fireworks-slides.txt
   pypy/extradoc/talk/warsaw2006/src/slideshow.py
   pypy/extradoc/talk/warsaw2006/src/web.py
Log:
Adhere to new interface (for no particular reason)


Modified: pypy/extradoc/talk/warsaw2006/fireworks-slides.txt
==============================================================================
--- pypy/extradoc/talk/warsaw2006/fireworks-slides.txt	(original)
+++ pypy/extradoc/talk/warsaw2006/fireworks-slides.txt	Mon Feb 12 23:43:54 2007
@@ -118,9 +118,17 @@
 JavaScript example one (console):
 =================================
 
+.. raw:: html
+
+   <a href="http://localhost:8001">Here</a>
+
 JavaScript example two (Bub'n'Bros):
 ====================================
 
+.. raw:: html
+
+   <a href="http://localhost:8080">Here</a>
+
 Transparent proxy:
 ==================
 

Modified: pypy/extradoc/talk/warsaw2006/src/slideshow.py
==============================================================================
--- pypy/extradoc/talk/warsaw2006/src/slideshow.py	(original)
+++ pypy/extradoc/talk/warsaw2006/src/slideshow.py	Mon Feb 12 23:43:54 2007
@@ -20,7 +20,7 @@
             self.show(self.counter)
 
     def delete_nodes(self):
-        content = dom.get_document().getElementById("contentspace")
+        content = dom.document.getElementById("contentspace")
         for child in content.childNodes[:]:
             content.removeChild(child)
         content.style.position = "absolute"
@@ -28,7 +28,7 @@
         content.style.left = "170px"
 
     def show(self, num):
-        content = dom.get_document().getElementById("contentspace")
+        content = dom.document.getElementById("contentspace")
         if len(content.childNodes) > 0:
             content.removeChild(content.childNodes[0])
         content.appendChild(self.pages[num])
@@ -44,13 +44,13 @@
         page.left()
 
 def show():
-    elements = [i for i in dom.get_document().getElementsByTagName('div')\
+    elements = [i for i in dom.document.getElementsByTagName('div')\
                 if i.getAttribute('class')=='section']
 
     page.set_pages(elements)
     page.delete_nodes()
     page.show(0)
-    dom.get_document().onkeypress = keydown
+    dom.document.onkeypress = keydown
     #createLoggingPane(True)
 
 def comeback(msg):

Modified: pypy/extradoc/talk/warsaw2006/src/web.py
==============================================================================
--- pypy/extradoc/talk/warsaw2006/src/web.py	(original)
+++ pypy/extradoc/talk/warsaw2006/src/web.py	Mon Feb 12 23:43:54 2007
@@ -4,12 +4,13 @@
 """
 
 import py
-from pypy.translator.js.examples import server
+from pypy.translator.js.lib import server
 
 from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal,\
      described
 from pypy.translator.js import commproxy
 from pypy.translator.js.main import rpython2javascript
+from pypy.translator.js.lib.support import callback
 
 from pypy.translator.interactive import Translation
 
@@ -42,32 +43,32 @@
 
         self.t2 = Translation(f)
 
-    @described(retval=None)
+    @callback(retval=None)
     def flow_basic(self):
         self._create_t()
         self.t.view()
 
-    @described(retval=None)
+    @callback(retval=None)
     def annotate_basic(self):
         self._create_t()
         self.t.annotate([int])
         self.t.view()
 
-    @described(retval=None)
+    @callback(retval=None)
     def rtype_basic(self):
         self._create_t()
         self.t.annotate([int])
         self.t.rtype()
         self.t.view()
 
-    @described(retval=None)
+    @callback(retval=None)
     def example(self):
         self._create_t2()
         self.t2.annotate()
         self.t2.rtype()
         self.t2.view()
 
-    @described(retval=None)
+    @callback(retval=None)
     def const_fold(self):
         self._create_t2()
         self.t2.backendopt()
@@ -99,4 +100,4 @@
     style_css.exposed = True
 
 if __name__ == '__main__':
-    server.start_server(server_address=('localhost', 7070), handler=Handler, start_new=False)
+    server.create_server(server_address=('localhost', 7071), handler=Handler).serve_forever()



More information about the Pypy-commit mailing list