resolve type linting errors

dev
dadevel 1 year ago
parent 2bbc743d9b
commit 0e55f3fcf8
No known key found for this signature in database
GPG Key ID: 1A8A9735430193D5

@ -134,7 +134,7 @@ class Peer:
@dataclasses.dataclass @dataclasses.dataclass
class Interface: class Interface:
name: str name: str
base_netns: str base_netns: str|None = None
private_key: Optional[str] = None private_key: Optional[str] = None
public_key: Optional[str] = None public_key: Optional[str] = None
address: list[str] = dataclasses.field(default_factory=list) address: list[str] = dataclasses.field(default_factory=list)
@ -144,7 +144,7 @@ class Interface:
peers: list[Peer] = dataclasses.field(default_factory=list) peers: list[Peer] = dataclasses.field(default_factory=list)
@classmethod @classmethod
def from_dict(cls, data: dict[str, Any], base_netns=None) -> Interface: def from_dict(cls, data: dict[str, Any], base_netns: str|None = None) -> Interface:
peers = data.pop('peers', list()) peers = data.pop('peers', list())
peers = [Peer.from_dict({key.replace('-', '_'): value for key, value in peer.items()}) for peer in peers] peers = [Peer.from_dict({key.replace('-', '_'): value for key, value in peer.items()}) for peer in peers]
return cls(**data, peers=peers, base_netns=base_netns) return cls(**data, peers=peers, base_netns=base_netns)
@ -293,7 +293,7 @@ class Namespace:
interfaces = data.pop('interfaces', list()) interfaces = data.pop('interfaces', list())
base_netns = data.pop('base_netns', None) base_netns = data.pop('base_netns', None)
interfaces = [Interface.from_dict({key.replace('-', '_'): value for key, value in interface.items()}, base_netns=base_netns) for interface in interfaces] interfaces = [Interface.from_dict({key.replace('-', '_'): value for key, value in interface.items()}, base_netns=base_netns) for interface in interfaces]
return cls(**data, **scriptlets, interfaces=interfaces) return cls(**data, **scriptlets, interfaces=interfaces) # type: ignore
def setup(self) -> Namespace: def setup(self) -> Namespace:
if self.managed: if self.managed:
@ -349,27 +349,27 @@ class Namespace:
pass pass
def wg(*args, netns: str = None, stdin: str = None, check=True, capture=False) -> str: def wg(*args, netns: str|None = None, stdin: str|None = None, check=True, capture=False) -> str:
return ip_netns_exec('wg', *args, netns=netns, stdin=stdin, check=check, capture=capture) return ip_netns_exec('wg', *args, netns=netns, stdin=stdin, check=check, capture=capture)
def ip_netns_eval(*args, netns: str = None, stdin: str = None, check=True, capture=False) -> str: def ip_netns_eval(*args, netns: str|None = None, stdin: str|None = None, check=True, capture=False) -> str:
return ip_netns_exec(SHELL, '-c', *args, netns=netns, stdin=stdin, check=check, capture=capture) return ip_netns_exec(SHELL, '-c', *args, netns=netns, stdin=stdin, check=check, capture=capture)
def ip_netns_exec(*args, netns: str = None, stdin: str = None, check=True, capture=False) -> str: def ip_netns_exec(*args, netns: str|None = None, stdin: str|None = None, check=True, capture=False) -> str:
return ip('netns', 'exec', netns, *args, stdin=stdin, check=check, capture=capture) return ip('netns', 'exec', netns, *args, stdin=stdin, check=check, capture=capture)
def ip(*args, stdin: str = None, netns=None, check=True, capture=False) -> str: def ip(*args, stdin: str|None = None, netns=None, check=True, capture=False) -> str:
return run('ip', *([] if netns is None else ['-n', netns]), *args, stdin=stdin, check=check, capture=capture) return run('ip', *([] if netns is None else ['-n', netns]), *args, stdin=stdin, check=check, capture=capture)
def host_eval(*args, stdin: str = None, check=True, capture=False) -> str: def host_eval(*args, stdin: str|None = None, check=True, capture=False) -> str:
return run(SHELL, '-c', *args, stdin=stdin, check=check, capture=capture) return run(SHELL, '-c', *args, stdin=stdin, check=check, capture=capture)
def run(*args, stdin: str = None, check=True, capture=False) -> str: def run(*args, stdin: str|None = None, check=True, capture=False) -> str:
args = [str(item) if item is not None else '' for item in args] args = [str(item) if item is not None else '' for item in args]
if VERBOSE: if VERBOSE:
print('>', ' '.join(args), file=sys.stderr) print('>', ' '.join(args), file=sys.stderr)

Loading…
Cancel
Save