Skip to content

Enhance parsing of Accept-Language quality values #2547

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enhance parsing of Accept-Language quality values #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1130647
Enhance parsing of Accept-Language quality values
spaceone Dec 3, 2018
7164da5
fixup! Enhance parsing of Accept-Language quality values
spaceone Aug 29, 2022
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
8 changes: 8 additions & 0 deletions tornado/test/web_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3183,6 +3183,14 @@ def test_accept_language(self):
response = self.fetch("/", headers={"Accept-Language": "fr-FR; q=0.9"})
self.assertEqual(response.headers["Content-Language"], "fr-FR")

response = self.fetch("/", headers={"Accept-Language": "fr-FR; foo=bar; q=0.9"})
self.assertEqual(response.headers["Content-Language"], "fr-FR")

response = self.fetch(
"/", headers={"Accept-Language": "fr-FR; foo=bar; q = 0.9"}
)
self.assertEqual(response.headers["Content-Language"], "fr-FR")

def test_accept_language_ignore(self):
response = self.fetch("/", headers={"Accept-Language": "fr-FR;q=0"})
self.assertEqual(response.headers["Content-Language"], "en-US")
Expand Down
17 changes: 12 additions & 5 deletions tornado/web.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,17 +1292,24 @@ def get_browser_locale(self, default: str = "en_US") -> tornado.locale.Locale:
locales = []
for language in languages:
parts = language.strip().split(";")
if len(parts) > 1 and parts[1].strip().startswith("q="):
score = 1.0
for part in parts[1:]:
try:
score = float(parts[1].strip()[2:])
pname, part = part.split("=", 1)
except ValueError:
continue
if pname.strip() != "q":
continue
part = part.strip()
try:
score = float(part)
if score < 0:
raise ValueError()
except (ValueError, TypeError):
score = 0.0
else:
score = 1.0
break
if score > 0:
locales.append((parts[0], score))
locales.append((parts[0].strip(), score))
if locales:
locales.sort(key=lambda pair: pair[1], reverse=True)
codes = [loc[0] for loc in locales]
Expand Down