diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2018-10-17 13:39:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 13:39:00 -0600 |
| commit | 81661cf2c606d083818836f49314b7dc891e5397 (patch) | |
| tree | 50ab2b2f9987236c165e705d8502fe18764e0b20 | |
| parent | 741b3d6c9750ba30ba6fd7bc61d66d9f9febe75b (diff) | |
| parent | a940ff1c9766b75152cd1fe8f83835059d00bafd (diff) | |
| download | webob-81661cf2c606d083818836f49314b7dc891e5397.tar.gz | |
Merge pull request #383 from whiteroses/remove-asterisk_non0_found
Remove asterisk_non0_found
| -rw-r--r-- | src/webob/acceptparse.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/webob/acceptparse.py b/src/webob/acceptparse.py index 9226971..7d29879 100644 --- a/src/webob/acceptparse.py +++ b/src/webob/acceptparse.py @@ -4527,7 +4527,6 @@ class AcceptLanguageValidHeader(AcceptLanguage): | The difference between supplying a ``str`` to `default_tag` and `default` is that `default_tag` is checked against ``q=0`` ranges in the header to see - if it matches one of the ranges specified as not acceptable, whereas a ``str`` for the `default` argument is simply returned. @@ -4594,9 +4593,6 @@ class AcceptLanguageValidHeader(AcceptLanguage): not_acceptable_ranges = [] acceptable_ranges = [] - asterisk_non0_found = False - # Whether there is a '*' range in the header with q={not 0} - asterisk_q0_found = False # Whether there is a '*' range in the header with q=0 # While '*' is skipped in Lookup because it "does not convey enough @@ -4606,17 +4602,14 @@ class AcceptLanguageValidHeader(AcceptLanguage): # acceptable. for range_, qvalue in parsed: - if qvalue == 0.0: - if range_ == "*": # *;q=0 + if range_ == "*": + if qvalue == 0.0: asterisk_q0_found = True - else: # {non-* range};q=0 - not_acceptable_ranges.append(range_.lower()) - elif not asterisk_q0_found and range_ == "*": # *;q={not 0} - asterisk_non0_found = True - # if asterisk_q0_found, then it does not matter whether - # asterisk_non0_found - else: # {non-* range};q={not 0} + elif qvalue == 0.0: + not_acceptable_ranges.append(range_.lower()) + else: acceptable_ranges.append((range_, qvalue)) + # range_ is .lower()ed later # Sort acceptable_ranges by qvalue, descending order acceptable_ranges.sort(key=lambda tuple_: tuple_[1], reverse=True) # Sort guaranteed to be stable with Python >= 2.2, so position in |