Skip to content

Bugfix: Python 3.10 and 3.11 does not support type parameter #1

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

Open
Scipio4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix: Python 3.10 and 3.11 does not support type parameter #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/svdsuite/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import re
import itertools
import warnings
from typing import TypeVar

from svdsuite.parse import Parser
from svdsuite.model.parse import (
Expand Down Expand Up @@ -51,8 +52,9 @@
)
from svdsuite.model.type_alias import ParsedDimablePeripheralTypes, IntermediateDimablePeripheralTypes

T = TypeVar("T")

def or_if_none[T](a: None | T, b: None | T) -> None | T:
def or_if_none(a: None | T, b: None | T) -> None | T:
return a if a is not None else b


Expand Down
6 changes: 4 additions & 2 deletions src/svdsuite/resolve/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import itertools
from typing import Any, Callable
from typing import Any, Callable, TypeVar

R = TypeVar("R")

from svdsuite.resolve.graph import ResolverGraph
from svdsuite.resolve.graph_elements import ElementNode
Expand All @@ -17,7 +19,7 @@ def __init__(self, resolver_logging_file_path: None | str, resolver_graph: Resol
self._html_generator = HTMLGenerator(self._resolver_logging_file_path)

@staticmethod
def _only_execute_if_logging_is_active[R](method: Callable[..., R]) -> Callable[..., R | None]:
def _only_execute_if_logging_is_active(method: Callable[..., R]) -> Callable[..., R | None]:
def wrapper(self: "ResolverLogger", *args: Any, **kwargs: Any) -> R | None:
if self._resolver_logging_file_path is None: # pylint: disable=protected-access
return None
Expand Down