From a17ad521022d2920795955b31f99fc144220fc9b Mon Sep 17 00:00:00 2001 From: Arvid Norlander Date: Wed, 5 Aug 2020 20:27:04 +0200 Subject: [PATCH] Use optimise imports in PyCharm for cleanup. This sorts imports into sections: * From standard library * From other libraries * From the current project Each section is sorted alphabetically. --- bin/validity-led-dance | 13 +++++-------- bin/validity-sensors-firmware | 5 ++--- dbus_service/dbus-service | 15 +++++++-------- scripts/dbus-cmd.py | 6 +----- scripts/lsdbus.py | 6 ------ scripts/prototype.py | 15 ++++----------- validitysensor/db.py | 7 +++---- validitysensor/flash.py | 5 +++-- validitysensor/init.py | 10 +++++----- validitysensor/init_db.py | 2 +- validitysensor/init_flash.py | 20 ++++++++++---------- validitysensor/sensor.py | 24 +++++++++++++----------- validitysensor/sid.py | 2 +- validitysensor/tls.py | 12 ++++++------ validitysensor/upload_fwext.py | 6 +++--- validitysensor/usb.py | 8 +++++--- validitysensor/util.py | 2 +- 17 files changed, 70 insertions(+), 88 deletions(-) diff --git a/bin/validity-led-dance b/bin/validity-led-dance index 2e67a2b..4c5fc2c 100755 --- a/bin/validity-led-dance +++ b/bin/validity-led-dance @@ -1,16 +1,13 @@ #!/usr/bin/env python3 import os - from binascii import unhexlify -from enum import Enum -from validitysensor.flash import read_flash -from validitysensor.sensor import glow_start_scan, glow_end_scan -from validitysensor.util import assert_status -from validitysensor.tls import tls -from validitysensor import init from time import sleep -from usb import core as usb_core + +from validitysensor import init +from validitysensor.sensor import glow_start_scan, glow_end_scan +from validitysensor.tls import tls +from validitysensor.util import assert_status if __name__ == "__main__": if os.geteuid() != 0: diff --git a/bin/validity-sensors-firmware b/bin/validity-sensors-firmware index 5457947..d1c77b4 100755 --- a/bin/validity-sensors-firmware +++ b/bin/validity-sensors-firmware @@ -20,14 +20,13 @@ import argparse import os +import shutil import subprocess import sys import tempfile import urllib.request -import shutil +from enum import Enum -from enum import Enum, auto -from time import sleep from usb import core as usb_core python_validity_data = '/usr/share/python-validity/' diff --git a/dbus_service/dbus-service b/dbus_service/dbus-service index 8c40b25..031a089 100755 --- a/dbus_service/dbus-service +++ b/dbus_service/dbus-service @@ -1,6 +1,8 @@ #!/usr/bin/env python3 import argparse +import logging +import logging.handlers import os import pwd import re @@ -16,21 +18,18 @@ import dbus import dbus.mainloop.glib import dbus.service import yaml +from gi.repository import GLib from usb import core as usb_core -dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -from gi.repository import GLib -import logging -import logging.handlers - from validitysensor import init -from validitysensor.tls import tls -from validitysensor.usb import usb -from validitysensor.sid import sid_from_string from validitysensor.db import subtype_to_string, db, SidIdentity, User from validitysensor.sensor import sensor, RebootException +from validitysensor.sid import sid_from_string +from validitysensor.tls import tls +from validitysensor.usb import usb from validitysensor.winbio_constants import finger_ids +dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) GLib.threads_init() INTERFACE_NAME = 'io.github.uunicorn.Fprint.Device' diff --git a/scripts/dbus-cmd.py b/scripts/dbus-cmd.py index d6658db..93b44bc 100755 --- a/scripts/dbus-cmd.py +++ b/scripts/dbus-cmd.py @@ -1,11 +1,7 @@ #!/usr/bin/env python3 -import argparse -import re -import dbus import dbus.mainloop.glib dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -from gi.repository import GObject, GLib import sys bus = dbus.SystemBus() @@ -13,4 +9,4 @@ o = bus.get_object('net.reactivated.Fprint', '/net/reactivated/Fprint/Manager', o = o.GetDefaultDevice() o = bus.get_object('net.reactivated.Fprint', o, introspect=False) o = dbus.Interface(o, 'net.reactivated.Fprint.Device') -print(o.RunCmd(sys.argv[1])) +print(o.RunCmd(sys.argv[1])) \ No newline at end of file diff --git a/scripts/lsdbus.py b/scripts/lsdbus.py index 74fec3f..9ad1770 100755 --- a/scripts/lsdbus.py +++ b/scripts/lsdbus.py @@ -1,13 +1,7 @@ #!/usr/bin/env python3 -import argparse -import re -import dbus import dbus.mainloop.glib dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -from gi.repository import GObject, GLib - -import pwd bus = dbus.SystemBus() o = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus') diff --git a/scripts/prototype.py b/scripts/prototype.py index f39bfcb..9ffabe5 100644 --- a/scripts/prototype.py +++ b/scripts/prototype.py @@ -1,14 +1,7 @@ -from validitysensor.tls import tls -from validitysensor.usb import usb -from validitysensor.db import db -from validitysensor.flash import read_flash -from validitysensor.sensor import * -from validitysensor.sid import * -from validitysensor.init import open as open9x -from threading import Condition -from time import sleep -import logging -import code +from binascii import hexlify + +from validitysensor.sensor import sensor + #usb.trace_enabled = True #tls.trace_enabled = True diff --git a/validitysensor/db.py b/validitysensor/db.py index bafd875..3431fe0 100644 --- a/validitysensor/db.py +++ b/validitysensor/db.py @@ -1,11 +1,10 @@ -import typing - -from .tls import tls -from .util import assert_status from binascii import hexlify + from .blobs import db_write_enable from .flash import call_cleanups from .sid import * +from .tls import tls +from .util import assert_status from .winbio_constants import finger_names diff --git a/validitysensor/flash.py b/validitysensor/flash.py index 0c4a60f..2db41a3 100644 --- a/validitysensor/flash.py +++ b/validitysensor/flash.py @@ -1,8 +1,9 @@ -from .tls import tls from struct import pack, unpack -from .util import assert_status, unhex + from .blobs import db_write_enable from .hw_tables import flash_ic_table_lookup +from .tls import tls +from .util import assert_status, unhex class FlashInfo(): diff --git a/validitysensor/init.py b/validitysensor/init.py index 97fb8a4..909c3b8 100644 --- a/validitysensor/init.py +++ b/validitysensor/init.py @@ -1,13 +1,13 @@ import atexit import logging -from validitysensor.usb import usb -from validitysensor.tls import tls -from validitysensor.sensor import sensor, reboot, RebootException from validitysensor.flash import read_tls_flash -from validitysensor.init_flash import init_flash -from validitysensor.upload_fwext import upload_fwext from validitysensor.init_db import init_db +from validitysensor.init_flash import init_flash +from validitysensor.sensor import sensor, reboot, RebootException +from validitysensor.tls import tls +from validitysensor.upload_fwext import upload_fwext +from validitysensor.usb import usb def close(): diff --git a/validitysensor/init_db.py b/validitysensor/init_db.py index d2e37f8..d9b9211 100644 --- a/validitysensor/init_db.py +++ b/validitysensor/init_db.py @@ -1,5 +1,5 @@ -from struct import pack, unpack import logging +from struct import pack, unpack from .db import db diff --git a/validitysensor/init_flash.py b/validitysensor/init_flash.py index 3f45a4a..e427206 100644 --- a/validitysensor/init_flash.py +++ b/validitysensor/init_flash.py @@ -1,21 +1,21 @@ -import os -from struct import pack, unpack -from binascii import unhexlify -import logging - -from hashlib import sha256 import hmac +import logging +import os +from binascii import unhexlify +from hashlib import sha256 +from struct import pack, unpack + +from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.asymmetric import ec from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes -from cryptography.hazmat.backends import default_backend -from .tls import tls, hs_key, crt_hardcoded -from .usb import usb +from .blobs import reset_blob from .flash import write_flash, erase_flash, call_cleanups, PartitionInfo, get_flash_info from .sensor import reboot, RomInfo +from .tls import tls, hs_key, crt_hardcoded +from .usb import usb from .util import assert_status, unhex -from .blobs import reset_blob flash_layout_hardcoded = [ # id type access offset size diff --git a/validitysensor/sensor.py b/validitysensor/sensor.py index 0398ae0..4c220ca 100644 --- a/validitysensor/sensor.py +++ b/validitysensor/sensor.py @@ -1,21 +1,23 @@ +import logging +import os.path import typing +from binascii import hexlify, unhexlify from enum import Enum from hashlib import sha256 -import os.path -import logging +from struct import pack, unpack +from time import sleep + from usb import core as usb_core -from .tls import tls -from .usb import usb, CancelledException + +from . import timeslot as prg +from .blobs import reset_blob from .db import db, SidIdentity 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 -from .table_types import SensorTypeInfo, SensorCaptureProg -from binascii import hexlify, unhexlify -from .util import assert_status, unhex from .hw_tables import dev_info_lookup -from .blobs import reset_blob -from . import timeslot as prg +from .table_types import SensorTypeInfo, SensorCaptureProg +from .tls import tls +from .usb import usb, CancelledException +from .util import assert_status, unhex # TODO: this should be specific to an individual device (system may have more than one sensor) calib_data_path = '/usr/share/python-validity/calib-data.bin' diff --git a/validitysensor/sid.py b/validitysensor/sid.py index 1a68a63..47af524 100644 --- a/validitysensor/sid.py +++ b/validitysensor/sid.py @@ -1,5 +1,5 @@ -from struct import unpack, pack import typing +from struct import unpack, pack class SidIdentity(): diff --git a/validitysensor/tls.py b/validitysensor/tls.py index 7be4ff5..e9f9827 100644 --- a/validitysensor/tls.py +++ b/validitysensor/tls.py @@ -1,19 +1,19 @@ import hmac +import logging import os import pickle -import logging -from struct import pack, unpack from binascii import hexlify, unhexlify +from hashlib import sha256 +from struct import pack, unpack -from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.backends import default_backend +from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.asymmetric import ec from cryptography.hazmat.primitives.asymmetric.utils import Prehashed -from cryptography.hazmat.primitives import hashes -from hashlib import sha256 +from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes -from .util import unhex from .usb import usb +from .util import unhex password_hardcoded = unhexlify('717cd72d0962bc4a2846138dbb2c24192512a76407065f383846139d4bec2033') gwk_sign_hardcoded = unhexlify('3a4c76b76a97981d1274247e166610e77f4d9c9d07d3c728e532916bdd28b454') diff --git a/validitysensor/upload_fwext.py b/validitysensor/upload_fwext.py index 26509de..dbf012c 100644 --- a/validitysensor/upload_fwext.py +++ b/validitysensor/upload_fwext.py @@ -1,10 +1,10 @@ -from time import ctime import logging from os.path import basename +from time import ctime -from .usb import usb -from .sensor import reboot, write_hw_reg32, read_hw_reg32, identify_sensor from .flash import write_flash_all, write_fw_signature, get_fw_info +from .sensor import reboot, write_hw_reg32, read_hw_reg32, identify_sensor +from .usb import usb firmware_home = '/usr/share/python-validity' diff --git a/validitysensor/usb.py b/validitysensor/usb.py index 6b80bc9..f6cf468 100644 --- a/validitysensor/usb.py +++ b/validitysensor/usb.py @@ -1,11 +1,13 @@ -import logging import errno -import usb.core as ucore +import logging from binascii import hexlify, unhexlify -from .util import assert_status from struct import unpack + +import usb.core as ucore from usb.core import USBError + from .blobs import init_hardcoded, init_hardcoded_clean_slate +from .util import assert_status supported_devices = [ (0x138a, 0x0090), diff --git a/validitysensor/util.py b/validitysensor/util.py index 9a35a8d..1966248 100644 --- a/validitysensor/util.py +++ b/validitysensor/util.py @@ -1,6 +1,6 @@ import re -from struct import unpack from binascii import unhexlify +from struct import unpack def assert_status(b):