Use new syntax for PTL. (quixote/demo/widgets.ptl)

Neil Schemenauer <nascheme-fVcApmY9cLvQ3/1i3zOLAti2O/[email protected]> Tue, 26 Nov 2002 18:50:44 -0500
Newsgroups gmane.comp.web.quixote.cvs
Message-ID <[email protected]>
Update of /home/cvs/quixote/demo
In directory hewson:/tmp/cvs-serv7818

Modified Files:
	widgets.ptl 
Log Message:
Use new syntax for PTL.


Index: widgets.ptl
===================================================================
RCS file: /home/cvs/quixote/demo/widgets.ptl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- widgets.ptl	29 Jan 2002 17:58:57 -0000	1.4
+++ widgets.ptl	26 Nov 2002 23:50:42 -0000	1.5
@@ -8,10 +8,9 @@
 import time
 from pprint import pprint
 from quixote.form import widget
-from quixote.html import html_quote
 
 
-template widgets(request):
+def widgets(request):
 
     # Whether we are generating or processing the form with these
     # widgets, we need all the widget objects -- so create them now.
@@ -32,7 +31,7 @@
         allowed_values=['cheese', 'pepperoni', 'green peppers', 'mushrooms',
                         'sausage', 'anchovies', 'onions'],
         size=5)
-    widgets['time'] = widget.HiddenWidget('time', value=str(time.time()))
+    widgets['time'] = widget.HiddenWidget('time', value=time.time())
 
     if request.form:
         # If we have some form data, then we're being invoked to process
@@ -50,7 +49,7 @@
         return render_widgets(request, widgets)
 
 
-template render_widgets (request, widgets):
+def render_widgets [html] (request, widgets):
     """\
 <html>
 <head><title>Quixote Widget Demo</title></head>
@@ -93,7 +92,7 @@
 </html>
 '''
 
-template process_widgets (request, widgets):
+def process_widgets [html] (request, widgets):
     """\
 <html>
 <head><title>Quixote Widget Demo</title></head>
@@ -107,9 +106,9 @@
     row_fmt = '  <tr><th align="left">%s</th><td>%s</td></tr>\n'
     fallback = '<i>nothing</i>'
     row_fmt % ("name",
-               html_quote(widgets['name'].parse(request), fallback))
+               widgets['name'].parse(request) or fallback)
     row_fmt % ("password",
-               html_quote(widgets['password'].parse(request), fallback))
+               widgets['password'].parse(request) or fallback)
     row_fmt % ("confirmation",
                widgets['confirm'].parse(request))
     row_fmt % ("eye colour",