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

@@ -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:

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/'

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'

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]))

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')

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

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
 
 

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():

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():

validitysensor/init_db.py

@@ -1,5 +1,5 @@
-from struct import pack, unpack
 import logging
+from struct import pack, unpack
 
 from .db import db
 

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

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'

validitysensor/sid.py

@@ -1,5 +1,5 @@
-from struct import unpack, pack
 import typing
+from struct import unpack, pack
 
 
 class SidIdentity():

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')

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'
 

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),

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):