Skip to content

Commit 443f796

Browse files
committed
Improve type hints
1 parent 05b906f commit 443f796

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

hubitatmaker/hub.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ def __init__(
4343
host: str,
4444
app_id: str,
4545
access_token: str,
46-
port: int = None,
47-
event_url: str = None,
48-
ssl_context: SSLContext = None
46+
port: Optional[int] = None,
47+
event_url: Optional[str] = None,
48+
ssl_context: Optional[SSLContext] = None,
4949
):
5050
"""Initialize a Hubitat hub interface.
5151
@@ -274,10 +274,10 @@ async def set_port(self, port: int) -> None:
274274
if self._server:
275275
self._server.stop()
276276
await self._start_server()
277-
277+
278278
async def set_ssl_context(self, ssl_context: Optional[SSLContext]) -> None:
279279
"""Set the SSLContext that the event listener server will use. Passing in a SSLContext object
280-
will make the event listener server HTTPS only. Passing in None will revert the server back
280+
will make the event listener server HTTPS only. Passing in None will revert the server back
281281
to HTTP.
282282
283283
Setting this will stop and restart the event listener server.
@@ -422,10 +422,10 @@ async def _start_server(self) -> None:
422422
)
423423
self._server.start()
424424
_LOGGER.debug(
425-
"Listening on %s:%d with SSL %s",
426-
address,
427-
self._server.port,
428-
"disabled" if self.ssl_context is None else "enabled"
425+
"Listening on %s:%d with SSL %s",
426+
address,
427+
self._server.port,
428+
"disabled" if self.ssl_context is None else "enabled",
429429
)
430430

431431
await self.set_event_url(self.event_url)

hubitatmaker/server.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from socket import socket as Socket
44
from ssl import SSLContext
55
import threading
6-
from typing import Any, Callable, Dict, List, cast
6+
from typing import Any, Callable, Dict, List, Optional, cast
77

88
from aiohttp import web
99

@@ -13,7 +13,13 @@
1313
class Server:
1414
"""A handle to a running server."""
1515

16-
def __init__(self, handle_event: EventCallback, host: str, port: int, ssl_context: SSLContext = None):
16+
def __init__(
17+
self,
18+
handle_event: EventCallback,
19+
host: str,
20+
port: int,
21+
ssl_context: Optional[SSLContext] = None,
22+
):
1723
"""Initialize a Server."""
1824
self.host = host
1925
self.port = port
@@ -63,7 +69,9 @@ def _run(self) -> None:
6369
asyncio.set_event_loop(self._server_loop)
6470
self._server_loop.run_until_complete(self._runner.setup())
6571

66-
site = web.TCPSite(self._runner, self.host, self.port, ssl_context=self.ssl_context)
72+
site = web.TCPSite(
73+
self._runner, self.host, self.port, ssl_context=self.ssl_context
74+
)
6775
self._server_loop.run_until_complete(site.start())
6876

6977
# If the Server was initialized with port 0, determine what port the
@@ -84,7 +92,10 @@ async def _stop(self) -> None:
8492

8593

8694
def create_server(
87-
handle_event: EventCallback, host: str = "0.0.0.0", port: int = 0, ssl_context: SSLContext = None
95+
handle_event: EventCallback,
96+
host: str = "0.0.0.0",
97+
port: int = 0,
98+
ssl_context: Optional[SSLContext] = None,
8899
) -> Server:
89100
"""Create a new server."""
90101
return Server(handle_event, host, port, ssl_context)

0 commit comments

Comments
 (0)