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.

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

Simplify (request.cookies.)getlist function #2838

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions sanic/cookies/request.py
Expand Up @@ -149,13 +149,11 @@ def get(self, name: str, default: Optional[Any] = None) -> Optional[Any]:
except KeyError:
return super().get(name, default)

def getlist(
self, name: str, default: Optional[Any] = None
) -> Optional[Any]:
def getlist(self, name: str) -> list[Any]:
try:
return self._get_prefixed_cookie(name)
except KeyError:
return super().getlist(name, default)
return super().getlist(name)

def _get_prefixed_cookie(self, name: str) -> Any:
getitem = super().__getitem__
Expand Down
9 changes: 4 additions & 5 deletions sanic/request/parameters.py
Expand Up @@ -19,15 +19,14 @@ def get(self, name: str, default: Optional[Any] = None) -> Optional[Any]:
return super().get(name, [default])[0]

def getlist(
self, name: str, default: Optional[Any] = None
) -> Optional[Any]:
self, name: str
) -> list[Any]:
"""Return the entire list

Args:
name (str): The name of the parameter
default (Optional[Any], optional): The default value. Defaults to None.

Returns:
Optional[Any]: The entire list
list[Any]: The entire list of values or [] if not found
""" # noqa: E501
return super().get(name, default)
return super().get(name) or []
10 changes: 5 additions & 5 deletions tests/test_cookies.py
Expand Up @@ -445,10 +445,10 @@ async def handler(request: Request):
"four": request.cookies.get("four", "fallback"),
},
"getlist": {
"one": request.cookies.getlist("one", ["fallback"]),
"two": request.cookies.getlist("two", ["fallback"]),
"three": request.cookies.getlist("three", ["fallback"]),
"four": request.cookies.getlist("four", ["fallback"]),
"one": request.cookies.getlist("one"),
"two": request.cookies.getlist("two"),
"three": request.cookies.getlist("three"),
"four": request.cookies.getlist("four"),
},
"getattr": {
"one": request.cookies.one,
Expand Down Expand Up @@ -484,7 +484,7 @@ async def handler(request: Request):
"one": ["1"],
"two": ["2"],
"three": ["3"],
"four": ["fallback"],
"four": [],
},
"getattr": {
"one": "1",
Expand Down