typing: add minimal types for mypy to not show error

Author: behrmann

varlink/server.py

@@ -13,6 +13,7 @@
     from socketserver import ForkingMixIn
 
 from types import GeneratorType
+from typing import Optional
 
 
 class Service:
@@ -324,7 +325,7 @@ class RequestHandler(StreamRequestHandler):
     Instantiate your own class and set the class variable service to your global :class:`Service` object.
     """
 
-    service = None
+    service: Optional[Service] = None
 
     def handle(self):
         message = b""

varlink/tests/test_certification.py

@@ -88,7 +88,7 @@ def __init__(self, wants, got):
 
 @service.interface("org.varlink.certification")
 class CertService:
-    next_method = {}
+    next_method: dict[str, str] = {}
 
     def new_client_id(self, _server):
         client_id = codecs.getencoder("hex")(os.urandom(16))[0].decode("ascii")
@@ -477,6 +477,8 @@ def usage():
         with varlink.Client.new_with_activate([__file__, "--varlink=$VARLINK_ADDRESS"]) as client:
             run_client(client)
     elif client_mode:
+        if client is None:
+            raise ValueError("--client requires at either of --varlink, --bridge or --activate")
         with client:
             run_client(client)
     else:

varlink/tests/test_mocks.py

@@ -12,7 +12,7 @@
 
 
 class Service:
-    def Test1(self, param1: int) -> str:
+    def Test1(self, param1: int) -> dict[str, dict[str, str]]:
         """return test: MyPersonalType"""
         return {
             "test": {
@@ -24,7 +24,7 @@ def Test1(self, param1: int) -> str:
     def Test2(self, param1: str = "test") -> None:
         pass
 
-    def Test3(self, param1: str) -> str:
+    def Test3(self, param1: str) -> dict[str, str]:
         """return test"""
         return {"test": param1}
 

varlink/tests/test_orgexamplemore.py

@@ -200,6 +200,8 @@ def epilog():
         with varlink.Client.new_with_activate([__file__, "--varlink=$VARLINK_ADDRESS"]) as client:
             run_client(client)
     elif client_mode:
+        if client is None:
+            raise ValueError("--client requires at either of --varlink, --bridge or --activate")
         with client:
             run_client(client)
     else: