Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh Request.accept functionality #2687

Merged
merged 11 commits into from
Feb 21, 2023
Merged

Refresh Request.accept functionality #2687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18a84dd
Blend new pattern with backwards compat
ahopkins Feb 16, 2023
284d82e
Blend new pattern with backwards compat
ahopkins Feb 16, 2023
b255145
Update errorpage to not use in
ahopkins Feb 16, 2023
7d84be3
Add check for typing
ahopkins Feb 16, 2023
7237fdb
Remove commented out code
ahopkins Feb 16, 2023
6eeee63
String only media type parts
ahopkins Feb 19, 2023
276fab8
Typing fixes
ahopkins Feb 19, 2023
843b3fe
Rename Accept to Matched
ahopkins Feb 19, 2023
5418bd0
Add back negative
ahopkins Feb 19, 2023
338e2b5
Cleanup tests
ahopkins Feb 19, 2023
9f77909
Fix error page test
ahopkins Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions sanic/errorpages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,10 +470,8 @@ def exception_response(
# Source:
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values

if acceptable and acceptable[0].match(
"text/html",
allow_type_wildcard=False,
allow_subtype_wildcard=False,
if acceptable and acceptable.match(
"text/html", accept_wildcards=False
):
renderer = HTMLRenderer

Expand All @@ -483,9 +481,7 @@ def exception_response(
elif (
acceptable
and acceptable.match(
"application/json",
allow_type_wildcard=False,
allow_subtype_wildcard=False,
"application/json", accept_wildcards=False
)
or content_type == "application/json"
):
Expand Down Expand Up @@ -514,13 +510,13 @@ def exception_response(
# our choice is okay
if acceptable:
type_ = CONTENT_TYPE_BY_RENDERERS.get(renderer) # type: ignore
if type_ and type_ not in acceptable:
if type_ and not acceptable.match(type_):
# If the renderer selected is not in the Accept header
# look through what is in the Accept header, and select
# the first option that matches. Otherwise, just drop back
# to the original default
for accept in acceptable:
mtype = f"{accept.type_}/{accept.subtype}"
mtype = f"{accept.type}/{accept.subtype}"
maybe = RENDERERS_BY_CONTENT_TYPE.get(mtype)
if maybe:
renderer = maybe
Expand Down
Loading