From 8ea4fc3cf447303d45bd82361e04106e19c4a71d Mon Sep 17 00:00:00 2001
From: James Arcus <jimbo@ucc.asn.au>
Date: Thu, 3 Aug 2023 20:10:19 +0800
Subject: [PATCH] Make fixes and annotations recommended by mypy
---
VendServer/CRC.py | 2 +-
VendServer/DispenseInterface.py | 2 +-
VendServer/OpenDispense.py | 2 +-
VendServer/VendServer.py | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/VendServer/CRC.py b/VendServer/CRC.py
index 512a7bd..3043e52 100644
--- a/VendServer/CRC.py
+++ b/VendServer/CRC.py
@@ -1,4 +1,4 @@
-crctab = []
+crctab: list[int] = []
CRC16 = 0x1021
def do_crc(message, crc = 0):
diff --git a/VendServer/DispenseInterface.py b/VendServer/DispenseInterface.py
index 94b2367..3927e3e 100644
--- a/VendServer/DispenseInterface.py
+++ b/VendServer/DispenseInterface.py
@@ -65,7 +65,7 @@ class DispenseInterface(object):
@param itemId The number entered into the vending machine
@return (itemname, price)
"""
- def getItemInfo(itemId):
+ def getItemInfo(self, itemId):
pass
"""
diff --git a/VendServer/OpenDispense.py b/VendServer/OpenDispense.py
index d227c1c..1958657 100644
--- a/VendServer/OpenDispense.py
+++ b/VendServer/OpenDispense.py
@@ -185,7 +185,7 @@ class OpenDispense(DispenseInterface):
logging.info('Enrolling card base64:%s to uid %s (%s)' % (card_base64, self._userId, self._username))
conn = self._connect(set_euid=True)
if conn is None:
- logging.warn("Enrolling card failed: Unable to connect".format(rsp))
+ logging.warn("Enrolling card failed: Unable to connect")
return False
rsp = conn.send_command("CARD_ADD %s" % (card_base64,))
if "200" in rsp:
diff --git a/VendServer/VendServer.py b/VendServer/VendServer.py
index 35ca1dc..cbc02d2 100755
--- a/VendServer/VendServer.py
+++ b/VendServer/VendServer.py
@@ -14,7 +14,7 @@ from .VendingMachine import VendingMachine, VendingException
from .MessageKeeper import MessageKeeper
from .HorizScroll import HorizScroll
from random import random, seed
-from .Idler import GreetingIdler,TrainIdler,GrayIdler,StringIdler,ClockIdler,FortuneIdler,FileIdler,PipeIdler
+from .Idler import Idler,GreetingIdler,TrainIdler,GrayIdler,StringIdler,ClockIdler,FortuneIdler,FileIdler,PipeIdler
import socket
from posix import geteuid
from .OpenDispense import OpenDispense as Dispense
@@ -126,7 +126,7 @@ class VendServer():
vstatus = None
state = None
event = None
- idlers = []
+ idlers: list[Idler] = []
idler = None
_pin_uid = 0
--
GitLab