Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor acceptable check to a helper function.

Browse Source
This commit is contained in:
L. Karkkainen 2023-01-29 03:00:04 +00:00
parent dfe2148333
commit 3ef99568a5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sanic/errorpages.py
View File

@ -437,6 +437,11 @@ def exception_response(
renderer = t.cast(t.Type[BaseRenderer], renderer) renderer = t.cast(t.Type[BaseRenderer], renderer)
return renderer(request, exception, debug).render() return renderer(request, exception, debug).render()
def _acceptable(req, mediatype):
# Check if the given type/subtype is an acceptable response
# TODO: Consider defaulting req.accept to */*:q=0 when there is no
# accept header at all, to allow simply using match().
return not req.accept or req.accept.match(mediatype)
def _guess_renderer(req: Request, fallback: str, base: t.Type[BaseRenderer]) -> t.Type[BaseRenderer]: def _guess_renderer(req: Request, fallback: str, base: t.Type[BaseRenderer]) -> t.Type[BaseRenderer]:
# Renderer selection order: # Renderer selection order:
@ -477,6 +482,5 @@ def _guess_renderer(req: Request, fallback: str, base: t.Type[BaseRenderer]) ->
# Use render_format if found and acceptable, otherwise fallback to base # Use render_format if found and acceptable, otherwise fallback to base
renderer = RENDERERS_BY_CONFIG.get(render_format, base) renderer = RENDERERS_BY_CONFIG.get(render_format, base)
type_ = CONTENT_TYPE_BY_RENDERERS[renderer] # type: ignore mediatype = CONTENT_TYPE_BY_RENDERERS[renderer] # type: ignore
acceptable = not req.accept or req.accept.match(type_) return renderer if _acceptable(req, mediatype) else base
return renderer if acceptable else base