From 66f552e63fb7568c6cd30e3c3c0b2735acadc418 Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Mon, 30 May 2022 23:25:17 +0200 Subject: [PATCH] typeckeck: annotate __main__ and fix gps303proto --- gps303/__main__.py | 11 ++++++++--- gps303/gps303proto.py | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gps303/__main__.py b/gps303/__main__.py index 1583280..2ad2ecf 100644 --- a/gps303/__main__.py +++ b/gps303/__main__.py @@ -1,10 +1,12 @@ """ Command line tool for sending requests to the terminal """ +from configparser import ConfigParser from datetime import datetime, timezone from getopt import getopt from logging import getLogger from sys import argv from time import time +from typing import List, Tuple import zmq from . import common @@ -14,9 +16,12 @@ from .zmsg import Bcast, Resp log = getLogger("gps303") -def main(conf, opts, args): - zctx = zmq.Context() - zpush = zctx.socket(zmq.PUSH) +def main( + conf: ConfigParser, opts: List[Tuple[str, str]], args: List[str] +) -> None: + # Is this https://github.com/zeromq/pyzmq/issues/1627 still not fixed?! + zctx = zmq.Context() # type: ignore + zpush = zctx.socket(zmq.PUSH) # type: ignore zpush.connect(conf.get("collector", "listenurl")) if len(args) < 2: diff --git a/gps303/gps303proto.py b/gps303/gps303proto.py index cee1bfa..c96a6dc 100755 --- a/gps303/gps303proto.py +++ b/gps303/gps303proto.py @@ -665,7 +665,9 @@ if True: # just to indent the code, sorry! PROTOS[cls.__name__] = cls.PROTO -def class_by_prefix(prefix: str) -> Union[type, List[Tuple[str, int]]]: +def class_by_prefix( + prefix: str, +) -> Union[Type[GPS303Pkt], List[Tuple[str, int]]]: lst = [ (name, proto) for name, proto in PROTOS.items() -- 2.39.2