wsgi, exception handling

2 files changed, 11 insertions, 2 deletions

diff --git a/examples/wsgi/index.html b/examples/wsgi/index.html
index da9aee7..cd0129e 100644
--- a/examples/wsgi/index.html
+++ b/examples/wsgi/index.html
@@ -2,3 +2,4 @@
 
 This is index.html
 
+c is ${c is not UNDEFINED and c or "undefined"}
diff --git a/examples/wsgi/run_wsgi.py b/examples/wsgi/run_wsgi.py
index 02ed47e..b6a4f18 100644
--- a/examples/wsgi/run_wsgi.py
+++ b/examples/wsgi/run_wsgi.py
@@ -11,7 +11,7 @@ def serve(environ, start_response):
             environ = environ,
             keep_blank_values = True
     )
-    d = dict([(k, f[k]) for k in fieldstorage])
+    d = dict([(k, formatfield(fieldstorage[k])) for k in fieldstorage])
     uri = environ.get('PATH_INFO', '/')
     
     try:
@@ -25,7 +25,15 @@ def serve(environ, start_response):
         start_response("200 OK", [('Content-type','text/html')])
         error_template = exceptions.html_error_template(lookup)
         return [error_template.render()]
-    
+
+def formatfield(f):
+    if isinstance(f, list):
+        return [formatfield(x) for x in f]
+    else:
+        return f.value
+            
 server = wsgiServer.WSGIServer (('localhost', 8000), {'/': serve})
 print "Server listening on port 8000"
 server.serve_forever()
+
+