Changeset 150

Timestamp:

02/13/05 09:28:49

Author:

rdelon

Message:

Fixed test for filter.
Fixed default _cpOnError to use a list fo cpg.response.body

Files:

• trunk/cherrypy/_cpdefaults.py (modified) (1 diff)
• trunk/cherrypy/_cphttptools.py (modified) (3 diffs)
• trunk/cherrypy/test/helper.py (modified) (1 diff)

trunk/cherrypy/_cpdefaults.py

@@ -61 +61 @@
-    bodyFile = StringIO.StringIO()
-    traceback.print_exc(file = bodyFile)
-bodyFile.getvalue()
+[bodyFile.getvalue()]
-    cpg.response.headerMap['Content-Type'] = 'text/plain'
-

trunk/cherrypy/_cphttptools.py

@@ -214 +214 @@
-        # error reporting seems to be broken in some cases. This code is 
-        # a helper to check it
-        print "%"*80
-        traceback.print_exc()
-        print "%"*80
-        err = ""
-        exc_info_1 = sys.exc_info()[1]
@@ -250 +248 @@
-                wfile.write(line)
-        except:
-            # TODO: in some cases exceptions and filters are conflicting; 
-            # error reporting seems to be broken in some cases. This code is 
-            # a helper to check it
-            #print "%"*80
-            #traceback.print_exc()
-            #print "%"*80
-            bodyFile = StringIO.StringIO()
-            traceback.print_exc(file = bodyFile)
@@ -408 +400 @@
-    cpg.request.objectPath = '/' + '/'.join(objectPathList[1:])
-    body = func(*(virtualPathList + cpg.request.paramList), **(cpg.request.paramMap))
-
+
-    # builds a uniform return type
-    if not isinstance(body, types.GeneratorType):

trunk/cherrypy/test/helper.py

@@ -122 +122 @@
-    def all(self):
-        cpg.server.stop()
+        return ""
-    all.exposed = True
-cpg.root.shutdown = Shutdown()