mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-python
synced 2026-01-15 09:53:32 +01:00
Fix errors reported by mypy
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
6835a569a5
commit
20f713e6f7
3 changed files with 15 additions and 13 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
from typing import Optional, Union
|
||||
|
||||
from ... import log
|
||||
from ...log import *
|
||||
from ... import Config
|
||||
from .. import Access
|
||||
from .. import Auth as AuthBase
|
||||
|
|
@ -23,25 +23,27 @@ class User(UserBase):
|
|||
def __init__(self, auth: AuthBase, name: str):
|
||||
self.__name = name
|
||||
self.__auth = auth
|
||||
self.__groups = None
|
||||
self.__groups: Optional[list[GroupBase]] = None
|
||||
|
||||
def _name(self) -> str:
|
||||
return self.__name
|
||||
|
||||
def _groups(self) -> list[Group]:
|
||||
def _groups(self) -> list[GroupBase]:
|
||||
if self.__groups is None:
|
||||
for name in conf['user.' + name + '.groups']:
|
||||
ret[name] = Group(self, name)
|
||||
name: str = ''
|
||||
ret: list[GroupBase] = []
|
||||
for name in self.__auth.conf['user.' + name + '.groups']:
|
||||
ret.append(Group(self.__auth, name))
|
||||
self.__groups = ret
|
||||
self.__groups = ret
|
||||
return self.__groups
|
||||
|
||||
class Auth(AuthBase): # export
|
||||
|
||||
def __init__(self, conf: Config):
|
||||
self.__conf = conf
|
||||
self.__users = None
|
||||
self.__users: Optional[dict[str, User]] = None
|
||||
self.__groups = None
|
||||
self.__current_user = None
|
||||
self.__current_user: User|None = None
|
||||
|
||||
def _user(self, name_) -> User:
|
||||
if self.__users is None:
|
||||
|
|
@ -51,8 +53,8 @@ class Auth(AuthBase): # export
|
|||
self.__users = ret
|
||||
return self.__users[name_]
|
||||
|
||||
def _access(self, what: str, access_type: Optional[Access]=None, who: Optional[Union[User|Group]]=None) -> bool:
|
||||
slog(log.WARNING, f'Returning False for {access_type} access to resource {what} by {who}')
|
||||
def _access(self, what: str, access_type: Optional[Access], who: User|GroupBase|None) -> bool: # type: ignore
|
||||
slog(WARNING, f'Returning False for {access_type} access to resource {what} by {who}')
|
||||
return False
|
||||
|
||||
def _current_user(self) -> User:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue