Skip to content

Eliminate implicit optional for CommParams types #1825

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

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Eliminate implicit optional for CommParams types #1825

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
033f566
Eliminate implicit optional for CommParams types
alexrudd2 Oct 16, 2023
50d6d52
Merge branch 'dev' into typing-CommParams
janiversen Oct 17, 2023
a452db1
Merge branch 'dev' into typing-CommParams
janiversen Oct 17, 2023
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
30 changes: 15 additions & 15 deletions pymodbus/transport/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,33 +85,33 @@ class CommParams:
"""Parameter class."""

# generic
comm_name: str = None
comm_type: CommType = None
reconnect_delay: float = None
reconnect_delay_max: float = None
timeout_connect: float = None
comm_name: str | None = None
comm_type: CommType | None = None
reconnect_delay: float | None = None
reconnect_delay_max: float | None = None
timeout_connect: float | None = None
host: str = "127.0.0.1"
port: int = 0
source_address: tuple[str, int] = ("0.0.0.0", 0)
handle_local_echo: bool = False

# tls
sslctx: ssl.SSLContext = None
sslctx: ssl.SSLContext | None = None

# serial
baudrate: int = None
bytesize: int = None
parity: str = None
stopbits: int = None
baudrate: int | None = None
bytesize: int | None = None
parity: str | None = None
stopbits: int | None = None

@classmethod
def generate_ssl(
cls,
is_server: bool,
certfile: str = None,
keyfile: str = None,
password: str = None,
sslctx: ssl.SSLContext = None,
certfile: str | None = None,
keyfile: str | None = None,
password: str | None = None,
sslctx: ssl.SSLContext | None = None,
) -> ssl.SSLContext:
"""Generate sslctx from cert/key/passwor

Expand All @@ -134,7 +134,7 @@ def generate_ssl(
)
return new_sslctx

def copy(self):
def copy(self) -> CommParams:
"""Create a copy."""
return dataclasses.replace(self)

Expand Down