Skip to content

fix: properly typehint Storage.get/pop #910

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

Merged
sillyElv merged 2 commits into from
Jul 11, 2022
Merged

fix: properly typehint Storage.get/pop #910

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48ec077
fix: properly typehint Storage.get
AstreaTSS Jul 11, 2022
2d41a69
fix: fix Storage.pop's typehints
AstreaTSS Jul 11, 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
33 changes: 30 additions & 3 deletions interactions/api/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
from collections import defaultdict
from typing import TYPE_CHECKING, Dict, Generic, List, Optional, Tuple, Type, TypeVar, Union
from typing import (
TYPE_CHECKING,
Dict,
Generic,
List,
Optional,
Tuple,
Type,
TypeVar,
Union,
overload,
)

if TYPE_CHECKING:
from .models import Snowflake
Expand Down Expand Up @@ -41,7 +52,15 @@ def add(self, item: _T, id: Optional["Key"] = None) -> None:
"""
self.values[id or item.id] = item

def get(self, id: "Key", default: Optional[_P] = None) -> Union[_T, _P]:
@overload
def get(self, id: "Key") -> Optional[_T]:
...

@overload
def get(self, id: "Key", default: _P) -> Union[_T, _P]:
...

def get(self, id: "Key", default: Optional[_P] = None) -> Union[_T, _P, None]:
"""
Gets an item from the storage.

Expand All @@ -63,7 +82,15 @@ def update(self, data: Dict["Key", _T]):
"""
self.values.update(data)

def pop(self, key: "Key", default: Optional[_P] = None) -> Union[_T, _P]:
@overload
def pop(self, key: "Key") -> Optional[_T]:
...

@overload
def pop(self, key: "Key", default: _P) -> Union[_T, _P]:
...

def pop(self, key: "Key", default: Optional[_P] = None) -> Union[_T, _P, None]:
try:
return self.values.pop(key)
except KeyError:
Expand Down