More type annotations

pyxcp/constants.py

@@ -1,43 +1,48 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import struct
+from typing import Callable
+from typing import NewType
 
+PackerType = NewType("PackerType", Callable[[int], bytes])
+UnpackerType = NewType("UnpackerType", Callable[[bytes], int])
 
-def makeBytePacker(byteorder="@"):
+
+def makeBytePacker(byteorder: str = "@") -> PackerType:
     """"""
     return struct.Struct("{}B".format(byteorder)).pack
 
 
-def makeByteUnpacker(byteorder="@"):
+def makeByteUnpacker(byteorder: str = "@") -> UnpackerType:
     """"""
     return struct.Struct("{}B".format(byteorder)).unpack
 
 
-def makeWordPacker(byteorder="@"):
+def makeWordPacker(byteorder: str = "@") -> PackerType:
     """"""
     return struct.Struct("{}H".format(byteorder)).pack
 
 
-def makeWordUnpacker(byteorder="@"):
+def makeWordUnpacker(byteorder: str = "@") -> UnpackerType:
     """"""
     return struct.Struct("{}H".format(byteorder)).unpack
 
 
-def makeDWordPacker(byteorder="@"):
+def makeDWordPacker(byteorder: str = "@") -> PackerType:
     """"""
     return struct.Struct("{}I".format(byteorder)).pack
 
 
-def makeDWordUnpacker(byteorder="@"):
+def makeDWordUnpacker(byteorder: str = "@") -> UnpackerType:
     """"""
     return struct.Struct("{}I".format(byteorder)).unpack
 
 
-def makeDLongPacker(byteorder="@"):
+def makeDLongPacker(byteorder: str = "@") -> PackerType:
     """"""
     return struct.Struct("{}Q".format(byteorder)).pack
 
 
-def makeDLongUnpacker(byteorder="@"):
+def makeDLongUnpacker(byteorder: str = "@") -> UnpackerType:
     """"""
     return struct.Struct("{}Q".format(byteorder)).unpack

pyxcp/master/master.py

@@ -23,14 +23,17 @@
 from pyxcp.constants import makeDWordUnpacker
 from pyxcp.constants import makeWordPacker
 from pyxcp.constants import makeWordUnpacker
+from pyxcp.constants import PackerType
+from pyxcp.constants import UnpackerType
 from pyxcp.master.errorhandler import disable_error_handling
 from pyxcp.master.errorhandler import wrapped
 from pyxcp.transport.base import createTransport
 from pyxcp.utils import delay
 from time import sleep
+from typing import Callable
 
 
-def broadcasted(func):
+def broadcasted(func: Callable):
     """"""
     return func