SVN: r20189 - in trunk/quixote: . server

Author: akuchlin
Date: 2003-01-16 08:45:52 -0500 (Thu, 16 Jan 2003)
New Revision: 20189

Modified:
   trunk/quixote/ACKS
   trunk/quixote/CHANGES
   trunk/quixote/server/medusa_http.py
Log:
Fix from David Cooke to make medusa_http work with HTML templates
Also fixed some whitespace, while I was at it



Modified: trunk/quixote/server/medusa_http.py
==============================================================================
--- trunk/quixote/server/medusa_http.py	(original)
+++ trunk/quixote/server/medusa_http.py	2003-01-16 08:45:53.000000000 -0500
@@ -62,16 +62,16 @@
                    'SERVER_PROTOCOL':'HTTP/1.1',
                    'SERVER_SOFTWARE':self.server_name,
                    }
-	for k,v in environ.items():
-	    if v == None:
-		environ[k] = ''
+        for k,v in environ.items():
+            if v == None:
+                environ[k] = ''
 
         stdin = StringIO(data)
         qreq = HTTPRequest(stdin, environ)
         qreq.process_inputs()
         output = self.publisher.process_request(qreq, environ)
         if output:
-            qreq.response.set_body(output)
+            qreq.response.set_body(str(output))
 
         output_file = StringIO()
         qreq.response.write(output_file)

Modified: trunk/quixote/CHANGES
==============================================================================
--- trunk/quixote/CHANGES	(original)
+++ trunk/quixote/CHANGES	2003-01-16 08:45:53.000000000 -0500
@@ -1,5 +1,8 @@
 0.6b2 (?? ??? 2003):
 
+  * Fix the Medusa HTTP server to work with HTML templates.
+
+
 0.6b1 (9 Jan 2003):
 
   * Merged form/form.py and form/form_templates.ptl into

Modified: trunk/quixote/ACKS
==============================================================================
--- trunk/quixote/ACKS	(original)
+++ trunk/quixote/ACKS	2003-01-16 08:45:53.000000000 -0500
@@ -9,6 +9,7 @@
 David Ascher
 Anton Benard
 Titus Brown
+David M. Cooke
 Jonathan Corbet
 Herman Cuppens
 Toby Dickenson