Skip to content

Z
Zope
Commit 04905a84 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Rearranged setting bobo exception headers so that type and value 

get set even if we fail setting traceback.
parent 36eb9b05
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
lib/python/ZPublisher/HTTPResponse.py
View file @ 04905a84
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
'''CGI Response Output formatter '''CGI Response Output formatter
$Id: HTTPResponse.py,v 1.17 1999/08/04 18:05:27 jim Exp $''' $Id: HTTPResponse.py,v 1.18 1999/08/04 20:50:22 jim Exp $'''
__version__='$Revision: 1.17 $'[11:-2] __version__='$Revision: 1.18 $'[11:-2]
import string, types, sys, regex import string, types, sys, regex
from string import find, rfind, lower, upper, strip, split, join, translate from string import find, rfind, lower, upper, strip, split, join, translate
...@@ -572,14 +572,14 @@ class HTTPResponse(BaseResponse): ...@@ -572,14 +572,14 @@ class HTTPResponse(BaseResponse):
try: try:
# Try to capture exception info for bci calls # Try to capture exception info for bci calls
et=translate(str(t),nl2sp) et=translate(str(t),nl2sp)
self.setHeader('bobo-exception-type',et)
ev=translate(str(v),nl2sp) ev=translate(str(v),nl2sp)
if find(ev,'<html>') >= 0: ev='bobo exception'
self.setHeader('bobo-exception-value',ev[:255])
# Get the tb tail, which is the interesting part: # Get the tb tail, which is the interesting part:
while tb.tb_next is not None: tb=tb.tb_next while tb.tb_next is not None: tb=tb.tb_next
el=str(tb.tb_lineno) el=str(tb.tb_lineno)
ef=str(tb.tb_frame.f_code.co_filename) ef=str(tb.tb_frame.f_code.co_filename)
if find(ev,'<html>') >= 0: ev='bobo exception'
self.setHeader('bobo-exception-type',et)
self.setHeader('bobo-exception-value',ev[:255])
self.setHeader('bobo-exception-file',ef) self.setHeader('bobo-exception-file',ef)
self.setHeader('bobo-exception-line',el) self.setHeader('bobo-exception-line',el)
...@@ -609,7 +609,6 @@ class HTTPResponse(BaseResponse): ...@@ -609,7 +609,6 @@ class HTTPResponse(BaseResponse):
b=v b=v
if isinstance(b,Exception): b=str(b) if isinstance(b,Exception): b=str(b)
if fatal and t is SystemExit and v.code==0: if fatal and t is SystemExit and v.code==0:
tb=self.setBody( tb=self.setBody(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7