ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-12 05:55:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop reading server module attributes all the time

Browse Source 
It jumps through a ton of deprecation machinery that is at least tedious in
the debugger, if not wasteful at runtime.
This commit is contained in:
Jean-Paul Calderone 2020-10-15 15:15:54 -04:00
parent 07246b3509
commit d38ae4d6dd
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,12 +10,15 @@ from hyperlink import (
from twisted.web import ( from twisted.web import (
http, http,
resource, resource,
server,
template, template,
) )
from twisted.web.template import ( from twisted.web.template import (
tags, tags,
) )
from twisted.web.server import (
NOT_DONE_YET,
UnsupportedMethod,
)
from twisted.web.util import ( from twisted.web.util import (
FailureElement, FailureElement,
redirectTo, redirectTo,
@ -426,7 +429,7 @@ class TokenOnlyWebApi(resource.Resource, object):
def render(self, req): def render(self, req):
if req.method != 'POST': if req.method != 'POST':
raise server.UnsupportedMethod(('POST',)) raise UnsupportedMethod(('POST',))
if req.args.get('token', False): if req.args.get('token', False):
raise WebError("Do not pass 'token' as URL argument", http.BAD_REQUEST) raise WebError("Do not pass 'token' as URL argument", http.BAD_REQUEST)
# not using get_arg() here because we *don't* want the token # not using get_arg() here because we *don't* want the token
@ -482,11 +485,11 @@ def render_exception(render):
result = maybeDeferred(bound_render, request) result = maybeDeferred(bound_render, request)
if isinstance(result, Deferred): if isinstance(result, Deferred):
result.addBoth(_finish, bound_render, request) result.addBoth(_finish, bound_render, request)
return server.NOT_DONE_YET return NOT_DONE_YET
elif isinstance(result, bytes): elif isinstance(result, bytes):
return result return result
elif result == server.NOT_DONE_YET: elif result == NOT_DONE_YET:
return server.NOT_DONE_YET return NOT_DONE_YET
else: else:
raise Exception("{!r} returned unusable {!r}".format( raise Exception("{!r} returned unusable {!r}".format(
fullyQualifiedName(bound_render), fullyQualifiedName(bound_render),
@ -522,7 +525,7 @@ def _finish(result, render, request):
_finish(redirectTo(str(result), request), render, request) _finish(redirectTo(str(result), request), render, request)
elif result is None: elif result is None:
request.finish() request.finish()
elif result == server.NOT_DONE_YET: elif result == NOT_DONE_YET:
pass pass
else: else:
log.err("Request for {!r} handled by {!r} returned unusable {!r}".format( log.err("Request for {!r} handled by {!r} returned unusable {!r}".format(
@ -547,7 +550,7 @@ def _renderHTTP_exception(request, failure):
if code is not None: if code is not None:
return _renderHTTP_exception_simple(request, text, code) return _renderHTTP_exception_simple(request, text, code)
if failure.check(server.UnsupportedMethod): if failure.check(UnsupportedMethod):
# twisted.web.server.Request.render() has support for transforming # twisted.web.server.Request.render() has support for transforming
# this into an appropriate 501 NOT_IMPLEMENTED or 405 NOT_ALLOWED # this into an appropriate 501 NOT_IMPLEMENTED or 405 NOT_ALLOWED
# return code, but nevow does not. # return code, but nevow does not.