mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-07 19:15:00 -04:00
Convert Requester to attrs (#9586)
... because namedtuples suck Fix up a couple of other annotations to keep mypy happy.
This commit is contained in:
parent
1107214a1d
commit
a7a3790066
5 changed files with 37 additions and 35 deletions
|
@ -16,7 +16,7 @@
|
|||
# limitations under the License.
|
||||
import logging
|
||||
import re
|
||||
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
|
||||
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
|
||||
|
||||
import attr
|
||||
|
||||
|
@ -1510,7 +1510,7 @@ class RegistrationStore(StatsStore, RegistrationBackgroundUpdateStore):
|
|||
async def user_delete_access_tokens(
|
||||
self,
|
||||
user_id: str,
|
||||
except_token_id: Optional[str] = None,
|
||||
except_token_id: Optional[int] = None,
|
||||
device_id: Optional[str] = None,
|
||||
) -> List[Tuple[str, int, Optional[str]]]:
|
||||
"""
|
||||
|
@ -1533,7 +1533,7 @@ class RegistrationStore(StatsStore, RegistrationBackgroundUpdateStore):
|
|||
|
||||
items = keyvalues.items()
|
||||
where_clause = " AND ".join(k + " = ?" for k, _ in items)
|
||||
values = [v for _, v in items]
|
||||
values = [v for _, v in items] # type: List[Union[str, int]]
|
||||
if except_token_id:
|
||||
where_clause += " AND id != ?"
|
||||
values.append(except_token_id)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue