ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 15:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

web/common.py: use 'Accept:' header to control HTML-vs-text/plain traceback renderings

Browse Source
This commit is contained in:
Brian Warner 2009-03-03 21:54:57 -07:00
parent 53f50fcc78
commit 90226f335f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/web/common.py
View File

@ -116,14 +116,18 @@ class MyExceptionHandler(appserver.DefaultExceptionHandler):
def simple(self, ctx, text, code=http.BAD_REQUEST): def simple(self, ctx, text, code=http.BAD_REQUEST):
req = IRequest(ctx) req = IRequest(ctx)
req.setResponseCode(code) req.setResponseCode(code)
#req.responseHeaders.setRawHeaders("content-encoding", [])
#req.responseHeaders.setRawHeaders("content-disposition", [])
req.setHeader("content-type", "text/plain;charset=utf-8") req.setHeader("content-type", "text/plain;charset=utf-8")
if isinstance(text, unicode): if isinstance(text, unicode):
text = text.encode("utf-8") text = text.encode("utf-8")
req.setHeader("content-length", str(len(text)))
req.write(text) req.write(text)
# TODO: consider putting the requested URL here # TODO: consider putting the requested URL here
req.finishRequest(False) req.finishRequest(False)
def renderHTTP_exception(self, ctx, f): def renderHTTP_exception(self, ctx, f):
traceback = f.getTraceback()
if f.check(ExistingChildError): if f.check(ExistingChildError):
return self.simple(ctx, return self.simple(ctx,
"There was already a child by that " "There was already a child by that "
@ -150,8 +154,15 @@ class MyExceptionHandler(appserver.DefaultExceptionHandler):
return self.simple(ctx, return self.simple(ctx,
"I don't know how to treat a %s request." % method, "I don't know how to treat a %s request." % method,
http.NOT_IMPLEMENTED) http.NOT_IMPLEMENTED)
super = appserver.DefaultExceptionHandler req = IRequest(ctx)
return super.renderHTTP_exception(self, ctx, f) accept = req.getHeader("accept")
if not accept:
accept = "*/*"
if "*/*" in accept or "text/*" in accept or "text/html" in accept:
super = appserver.DefaultExceptionHandler
return super.renderHTTP_exception(self, ctx, f)
# use plain text
return self.simple(ctx, traceback, http.INTERNAL_SERVER_ERROR)
class NeedOperationHandleError(WebError): class NeedOperationHandleError(WebError):
pass pass