From 9898b5d80a38317991320dead3ea2d0de2d8f72b Mon Sep 17 00:00:00 2001
From: Arvid Norlander <VorpalBlade@users.noreply.github.com>
Date: Sat, 1 Aug 2020 14:43:32 +0200
Subject: [PATCH] Fix some Python errors and clean up unused imports.

---
 setup.py                       | 2 +-
 validitysensor/db.py           | 6 +-----
 validitysensor/flash.py        | 2 --
 validitysensor/init.py         | 1 -
 validitysensor/init_db.py      | 3 ---
 validitysensor/init_flash.py   | 2 +-
 validitysensor/sensor.py       | 7 ++++---
 validitysensor/table_types.py  | 8 +++++---
 validitysensor/tls.py          | 8 +++-----
 validitysensor/upload_fwext.py | 6 +-----
 validitysensor/usb.py          | 4 +---
 11 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/setup.py b/setup.py
index e91769b..a703e1f 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ setup(name='python-validity',
     ],
     install_requires=[
         'cryptography >= 2.1.4',
-        'pyusb >= 1.0.2'
+        'pyusb >= 1.0.0'
     ],
     data_files=[
         ('share/dbus-1/system.d/', ['dbus_service/io.github.uunicorn.Fprint.conf']),
diff --git a/validitysensor/db.py b/validitysensor/db.py
index b6da5f2..e1614c0 100644
--- a/validitysensor/db.py
+++ b/validitysensor/db.py
@@ -1,10 +1,6 @@
-
-import logging
-from .util import unhex
 from .tls import tls
 from .util import assert_status
-from struct import pack, unpack
-from binascii import hexlify, unhexlify
+from binascii import hexlify
 from .blobs import db_write_enable
 from .flash import call_cleanups
 from .sid import *
diff --git a/validitysensor/flash.py b/validitysensor/flash.py
index 6c00ea9..b14a773 100644
--- a/validitysensor/flash.py
+++ b/validitysensor/flash.py
@@ -1,7 +1,5 @@
-
 from .tls import tls
 from struct import pack, unpack
-from binascii import hexlify, unhexlify
 from .util import assert_status, unhex
 from .blobs import db_write_enable
 from .hw_tables import flash_ic_table_lookup
diff --git a/validitysensor/init.py b/validitysensor/init.py
index 738e357..f2923c0 100644
--- a/validitysensor/init.py
+++ b/validitysensor/init.py
@@ -1,6 +1,5 @@
 
 import atexit
-import signal
 import logging
 
 from validitysensor.usb import usb
diff --git a/validitysensor/init_db.py b/validitysensor/init_db.py
index 6928523..e29c6bc 100644
--- a/validitysensor/init_db.py
+++ b/validitysensor/init_db.py
@@ -3,9 +3,6 @@ from struct import pack, unpack
 import logging
 
 from .db import db
-from .usb import usb
-from .tls import tls
-from .flash import read_flash
 
 def machine_id_rec_value(b):
     b = b.encode('utf-16le')
diff --git a/validitysensor/init_flash.py b/validitysensor/init_flash.py
index 09f6800..05be3ba 100644
--- a/validitysensor/init_flash.py
+++ b/validitysensor/init_flash.py
@@ -1,7 +1,7 @@
 
 import os
 from struct import pack, unpack
-from binascii import hexlify, unhexlify
+from binascii import unhexlify
 import logging
 
 from hashlib import sha256
diff --git a/validitysensor/sensor.py b/validitysensor/sensor.py
index c45e86d..2a70652 100644
--- a/validitysensor/sensor.py
+++ b/validitysensor/sensor.py
@@ -6,7 +6,7 @@ import logging
 from usb import core as usb_core
 from .tls import tls
 from .usb import usb, CancelledException
-from .db import db, subtype_to_string
+from .db import db
 from .flash import write_enable, call_cleanups, read_flash, erase_flash, write_flash_all, read_flash_all
 from time import sleep
 from struct import pack, unpack
@@ -70,11 +70,12 @@ def factory_reset():
     reboot()
 
 class RomInfo():
-    def get():
+    @classmethod
+    def get(cls):
         rsp=tls.cmd(b'\x01')
         assert_status(rsp)
         rsp=rsp[2:]
-        return RomInfo(*unpack('<LLBBxBxxxB', rsp[0:0x10]))
+        return cls(*unpack('<LLBBxBxxxB', rsp[0:0x10]))
 
     def __init__(self, timestamp, build, major, minor, product, u1):
         self.timestamp, self.build, self.major, self.minor, self.product, self.u1 = timestamp, build, major, minor, product, u1
diff --git a/validitysensor/table_types.py b/validitysensor/table_types.py
index 5b860e6..7765209 100644
--- a/validitysensor/table_types.py
+++ b/validitysensor/table_types.py
@@ -4,9 +4,10 @@ from binascii import hexlify, unhexlify
 class SensorTypeInfo:
     table=[]
 
-    def get_by_type(sensor_type):
+    @classmethod
+    def get_by_type(cls, sensor_type):
         from . import generated_tables
-        for i in SensorTypeInfo.table:
+        for i in cls.table:
             if i.sensor_type == sensor_type:
                 return i
 
@@ -46,7 +47,8 @@ def metric(i, rominfo):
 class SensorCaptureProg:
     table=[]
 
-    def get(rominfo, sensor_type, a0, a1):
+    @classmethod
+    def get(cls, rominfo, sensor_type, a0, a1):
         from . import generated_tables
 
         maximum = 0
diff --git a/validitysensor/tls.py b/validitysensor/tls.py
index f21a3fb..bd1bae7 100644
--- a/validitysensor/tls.py
+++ b/validitysensor/tls.py
@@ -1,6 +1,4 @@
-import re
 import hmac
-import sys
 import os
 import pickle
 import logging
@@ -14,8 +12,8 @@ from cryptography.hazmat.primitives.asymmetric.utils import Prehashed
 from cryptography.hazmat.primitives import hashes
 from hashlib import sha256
 
-from .usb import unhex, usb
-from .util import assert_status
+from .util import unhex
+from .usb import usb
 
 
 password_hardcoded=unhexlify('717cd72d0962bc4a2846138dbb2c24192512a76407065f383846139d4bec2033')
@@ -289,7 +287,7 @@ class Tls():
 
     def handle_server_hello_done(self, p):
         if p != b'':
-            raise Exeception('Not expecting any body for "server hello done" pkt: %s' % hexlify(p).decode())
+            raise Exception('Not expecting any body for "server hello done" pkt: %s' % hexlify(p).decode())
 
     def handle_finish(self, b):
         hs_hash = self.handshake_hash.copy().digest()
diff --git a/validitysensor/upload_fwext.py b/validitysensor/upload_fwext.py
index da8dca3..96875f6 100644
--- a/validitysensor/upload_fwext.py
+++ b/validitysensor/upload_fwext.py
@@ -1,14 +1,10 @@
-
-from binascii import hexlify, unhexlify
 from time import ctime
 import logging
 from os.path import basename
 
-from .tls import tls
 from .usb import usb
 from .sensor import reboot, write_hw_reg32, read_hw_reg32, identify_sensor
-from .flash import read_flash, erase_flash, write_flash_all, write_fw_signature, get_fw_info
-from .util import assert_status
+from .flash import write_flash_all, write_fw_signature, get_fw_info
 
 firmware_home='/usr/share/python-validity'
 
diff --git a/validitysensor/usb.py b/validitysensor/usb.py
index 46a2842..ce7c63f 100644
--- a/validitysensor/usb.py
+++ b/validitysensor/usb.py
@@ -3,10 +3,8 @@ import logging
 import errno
 import usb.core as ucore
 from binascii import *
-from .util import assert_status, unhex
+from .util import assert_status
 from struct import unpack
-from usb.util import claim_interface, release_interface
-from threading import Thread
 from usb.core import USBError
 from .blobs import init_hardcoded, init_hardcoded_clean_slate