Skip to content

Z
Zope
Commit a54429aa authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

Reformatting for readability + minor variable renaming. 

Add some comments that make it clear that the traceback object is not
referenced when the function exits.
parent 18641731
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 56 deletions
lib/python/ZPublisher/HTTPResponse.py
View file @ a54429aa
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
'''CGI Response Output formatter '''CGI Response Output formatter
$Id: HTTPResponse.py,v 1.49 2001/10/19 15:12:27 shane Exp $''' $Id: HTTPResponse.py,v 1.50 2001/10/22 20:07:40 jeremy Exp $'''
__version__='$Revision: 1.49 $'[11:-2] __version__='$Revision: 1.50 $'[11:-2]
import string, types, sys, re import string, types, sys, re
from string import find, rfind, lower, upper, strip, split, join, translate from string import find, rfind, lower, upper, strip, split, join, translate
...@@ -439,7 +439,7 @@ class HTTPResponse(BaseResponse): ...@@ -439,7 +439,7 @@ class HTTPResponse(BaseResponse):
return text return text
def format_exception(self,etype,value,tb,limit=None): def format_exception(self, etype, value, tb, limit=None):
import traceback import traceback
result=['Traceback (innermost last):'] result=['Traceback (innermost last):']
if limit is None: if limit is None:
...@@ -462,15 +462,15 @@ class HTTPResponse(BaseResponse): ...@@ -462,15 +462,15 @@ class HTTPResponse(BaseResponse):
str(locals['__traceback_info__'])) str(locals['__traceback_info__']))
except: pass except: pass
tb = tb.tb_next tb = tb.tb_next
n = n+1 n = n + 1
result.append(join(traceback.format_exception_only(etype, value), result.append(join(traceback.format_exception_only(etype, value),
' ')) ' '))
return result return result
def _traceback(self,t,v,tb): def _traceback(self, t, v, tb):
tb=self.format_exception(t,v,tb,200) tb = self.format_exception(t, v, tb, 200)
tb=join(tb,'\n') tb = join(tb, '\n')
tb=self.quoteHTML(tb) tb = self.quoteHTML(tb)
if self.debug_mode: _tbopen, _tbclose = '<PRE>', '</PRE>' if self.debug_mode: _tbopen, _tbclose = '<PRE>', '</PRE>'
else: _tbopen, _tbclose = '<!--', '-->' else: _tbopen, _tbclose = '<!--', '-->'
return "\n%s\n%s\n%s" % (_tbopen, tb, _tbclose) return "\n%s\n%s\n%s" % (_tbopen, tb, _tbclose)
...@@ -586,88 +586,91 @@ class HTTPResponse(BaseResponse): ...@@ -586,88 +586,91 @@ class HTTPResponse(BaseResponse):
tag_search=re.compile('[a-zA-Z]>').search, tag_search=re.compile('[a-zA-Z]>').search,
abort=1 abort=1
): ):
if type(info) is type(()) and len(info)==3: t,v,tb = info if type(info) is type(()) and len(info)==3:
else: t,v,tb = sys.exc_info() t, v, tb = info
else:
t, v, tb = sys.exc_info()
if t=='Unauthorized' or t == Unauthorized or ( if t == 'Unauthorized' or t == Unauthorized or (
isinstance(t, types.ClassType) and issubclass(t, Unauthorized) isinstance(t, types.ClassType) and issubclass(t, Unauthorized)):
):
t = 'Unauthorized' t = 'Unauthorized'
self._unauthorized() self._unauthorized()
stb=tb stb = tb # note alias between tb and stb
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) self.setHeader('bobo-exception-type', et)
ev=translate(str(v),nl2sp) ev = translate(str(v), nl2sp)
if find(ev,'<html>') >= 0: ev='bobo exception' if find(ev, '<html>') >= 0:
self.setHeader('bobo-exception-value',ev[:255]) 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:
el=str(tb.tb_lineno) tb = tb.tb_next
ef=str(tb.tb_frame.f_code.co_filename) el = str(tb.tb_lineno)
self.setHeader('bobo-exception-file',ef) ef = str(tb.tb_frame.f_code.co_filename)
self.setHeader('bobo-exception-line',el) self.setHeader('bobo-exception-file', ef)
self.setHeader('bobo-exception-line', el)
except: except:
# Dont try so hard that we cause other problems ;) # Dont try so hard that we cause other problems ;)
pass pass
tb=stb tb = stb # original traceback
stb=None del stb
self.setStatus(t) self.setStatus(t)
if self.status >= 300 and self.status < 400: if self.status >= 300 and self.status < 400:
if type(v) == types.StringType and absuri_match(v) is not None: if type(v) == types.StringType and absuri_match(v) is not None:
if self.status==300: self.setStatus(302) if self.status==300:
self.setStatus(302)
self.setHeader('location', v) self.setHeader('location', v)
tb=None tb = None # just one path covered
return self return self
else: else:
try: try:
l,b=v l, b = v
if type(l) == types.StringType and absuri_match(l) is not None: if (type(l) == types.StringType
if self.status==300: self.setStatus(302) and absuri_match(l) is not None):
if self.status==300:
self.setStatus(302)
self.setHeader('location', l) self.setHeader('location', l)
self.setBody(b) self.setBody(b)
tb=None tb = None # one more patch covered
return self return self
except: pass except:
pass # tb is not cleared in this case
b=v b = v
if isinstance(b,Exception): if isinstance(b, Exception):
try: try:
b=str(b) b = str(b)
except: except:
b='<unprintable %s object>' % type(b).__name__ b = '<unprintable %s object>' % type(b).__name__
if fatal and t is SystemExit and v.code==0:
tb=self.setBody(
(str(t),
'Zope has exited normally.<p>'
+ self._traceback(t,v,tb)),
is_error=1)
#elif 1: self.setBody(v)
if fatal and t is SystemExit and v.code == 0:
body = self.setBody(
(str(t),
'Zope has exited normally.<p>' + self._traceback(t, v, tb)),
is_error=1)
elif type(b) is not types.StringType or tag_search(b) is None: elif type(b) is not types.StringType or tag_search(b) is None:
tb=self.setBody( body = self.setBody(
(str(t), (str(t),
'Sorry, a site error occurred.<p>'+ 'Sorry, a site error occurred.<p>'
self._traceback(t,v,tb)), + self._traceback(t, v, tb)),
is_error=1) is_error=1)
elif (lower(strip(b)[:6])=='<html>' or elif (lower(strip(b)[:6])=='<html>' or
lower(strip(b)[:14])=='<!doctype html'): lower(strip(b)[:14])=='<!doctype html'):
# error is an HTML document, not just a snippet of html # error is an HTML document, not just a snippet of html
tb=self.setBody(b + self._traceback(t,'(see above)',tb), body = self.setBody(b + self._traceback(t, '(see above)', tb),
is_error=1) is_error=1)
else: else:
tb=self.setBody( body = self.setBody((str(t),
(str(t), b + self._traceback(t,'(see above)',tb)), b + self._traceback(t,'(see above)', tb)),
is_error=1) is_error=1)
del tb
return tb return body
_wrote=None _wrote=None
......
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