fixed + completed type hints

This commit is contained in:
2024-04-12 23:33:09 +02:00
parent 30339f0ece
commit cce7e96779
8 changed files with 77 additions and 53 deletions

View File

@@ -1,6 +1,6 @@
from __future__ import annotations
from typing import Union
from typing import Union, Optional
class Range:
@@ -9,22 +9,23 @@ class Range:
end: int,
name: str,
description: str = "",
values: dict[str, Union[str, dict]] = None,
dependsOn: str = None) -> None:
values: Optional[dict[str, Union[str, dict]]] = None,
dependsOn: Optional[tuple[int, int]] = None) -> None:
self.start = start
self.end = end
self.name = name
self.description = description
self.values = values
self.dependsOn = dependsOn
self.lastValueY = -1
self.start: int = start
self.end: int = end
self.name: str = name
self.description: str = description
self.values: Optional[dict[str, Union[str, dict]]] = values
self.dependsOn: Optional[tuple[int, int]] = dependsOn
self.lastValueY: int = -1
@property
def bits(self) -> int:
return self.end - self.start + 1
def load(start: int, end: int, data: dict):
@staticmethod
def load(start: int, end: int, data: dict) -> Range:
values = None
bits = end - start + 1
@@ -45,9 +46,11 @@ class Range:
values,
dependsOn)
@staticmethod
def parseSpan(span: str) -> tuple[int, int]:
startEnd = span.split("-")
if len(startEnd) == 1: startEnd.append(startEnd[0])
if len(startEnd) == 1:
startEnd.append(startEnd[0])
start = int(startEnd[1])
end = int(startEnd[0])
return (start, end)
return (start, end)