Standardizing imports

src/main.py

@@ -2,11 +2,7 @@ import configparser
 import sys
 import time
 
-sys.path.append('./views')
-sys.path.append('./models')
-sys.path.append('./helpers')
-
-from controller import Controller
+from seedsigner.controller import Controller
 
 
 config = configparser.ConfigParser()

src/seedsigner/controller.py

@@ -4,20 +4,11 @@ from multiprocessing import Process, Queue
 from subprocess import call
 
 # Internal file class dependencies
-from view import View
-from menu_view import MenuView
-from seed_tools_view import SeedToolsView
-from signing_tools_view import SigningToolsView
-from settings_tools_view import SettingsToolsView
-from io_test_view import IOTestView
-from buttons import Buttons, B
-from camera_process import CameraProcess
-from path import Path
-from seed_storage import SeedStorage
-from specter_desktop_multisig_wallet import SpecterDesktopMultisigWallet
-from blue_vault_wallet import BlueVaultWallet
-from sparrow_multisig_wallet import SparrowMultiSigWallet
-from generic_ur2_wallet import GenericUR2Wallet
+from .views import (View, MenuView, SeedToolsView,SigningToolsView, 
+    SettingsToolsView, IOTestView)
+from .helpers import Buttons, B, CameraProcess,Path
+from .models import (SeedStorage, SpecterDesktopMultisigWallet, BlueVaultWallet,
+    SparrowMultiSigWallet, GenericUR2Wallet)
 
 
 class Controller:

src/seedsigner/helpers/__init__.py

@@ -0,0 +1,5 @@
+from buttons import Buttons, B
+from camera_process import CameraProcess, CameraPoll
+from path import Path
+from qr import QR
+from ST7789 import ST7789

src/seedsigner/models/__init__.py

@@ -0,0 +1,6 @@
+from blue_vault_wallet import BlueVaultWallet
+from generic_ur2_wallet import GenericUR2Wallet
+from seed_storage import SeedStorage
+from sparrow_multisig_wallet import SparrowMultiSigWallet
+from specter_desktop_multisig_wallet import SpecterDesktopMultisigWallet
+from specter_desktop_single_sig_wallet import SpecterDesktopSingleSigWallet

src/seedsigner/models/blue_vault_wallet.py

@@ -1,5 +1,7 @@
-from wallet import Wallet
-from qr import QR
+from . import Wallet
+from seedsigner.helpers import QR
+from seedsigner.helpers.bcur import (bcur_decode, cbor_decode, bc32decode,
+    bc32encode, cbor_encode, bcur_encode)
 
 # External Dependencies
 from embit.bip39 import mnemonic_to_bytes
@@ -12,7 +14,6 @@ from embit.networks import NETWORKS
 from embit import ec
 from io import BytesIO
 from binascii import unhexlify, hexlify, a2b_base64, b2a_base64
-from bcur import bcur_decode, cbor_decode, bc32decode, bc32encode, cbor_encode, bcur_encode
 import re
 
 class BlueVaultWallet(Wallet):

src/seedsigner/models/generic_ur2_wallet.py

@@ -1,9 +1,12 @@
-from wallet import Wallet
-from buttons import Buttons, B
-from camera_process import CameraProcess
-from camera_process import CameraPoll
-from view import View
-from qr import QR
+from . import Wallet
+
+from seedsigner.helpers import Buttons, B, CameraProcess, CameraPoll, QR
+from seedsigner.helpers.bcur import bcur_decode, cbor_decode, bc32decode, bc32encode, cbor_encode, bcur_encode
+from seedsigner.helpers.ur2.ur_decoder import URDecoder
+from seedsigner.helpers.ur2.ur_encoder import UREncoder
+from seedsigner.helpers.ur2.cbor_lite import CBOREncoder
+from seedsigner.helpers.ur2.ur import UR
+from seedsigner.views import View
 
 # External Dependencies
 import time
@@ -17,11 +20,6 @@ from embit.networks import NETWORKS
 from embit import ec
 from io import BytesIO
 from binascii import unhexlify, hexlify, a2b_base64, b2a_base64
-from bcur import bcur_decode, cbor_decode, bc32decode, bc32encode, cbor_encode, bcur_encode
-from ur2.ur_decoder import URDecoder
-from ur2.ur_encoder import UREncoder
-from ur2.cbor_lite import CBOREncoder
-from ur2.ur import UR
 import re
 import textwrap
 

src/seedsigner/models/seed_storage.py

@@ -1,6 +1,5 @@
 # External Dependencies
-from embit.bip39 import mnemonic_to_bytes
-from embit.bip39 import mnemonic_from_bytes
+from embit.bip39 import mnemonic_to_bytes, mnemonic_from_bytes
 from embit import bip39
 
 class SeedStorage:

src/seedsigner/models/sparrow_multisig_wallet.py

@@ -1,27 +1,22 @@
-from wallet import Wallet
-from buttons import Buttons, B
-from camera_process import CameraProcess
-from camera_process import CameraPoll
-from view import View
-from qr import QR
+from . import Wallet
+
+from seedsigner.helpers import Buttons, B, CameraProcess, CameraPoll, QR
+from seedsigner.helpers.bcur import (bcur_decode, cbor_decode, bc32decode,
+    bc32encode, cbor_encode, bcur_encode)
+from seedsigner.helpers.ur2.ur_decoder import URDecoder
+from seedsigner.helpers.ur2.ur_encoder import UREncoder
+from seedsigner.helpers.ur2.cbor_lite import CBOREncoder
+from seedsigner.helpers.ur2.ur import UR
+from seedsigner.views import View
 
 # External Dependencies
 import time
-from embit.bip39 import mnemonic_to_bytes
-from embit.bip39 import mnemonic_from_bytes
-from embit import bip39
-from embit import script
-from embit import bip32
-from embit import psbt
+from embit import bip32, bip39, ec, script, psbt
+from embit.bip39 import mnemonic_to_bytes, mnemonic_from_bytes
 from embit.networks import NETWORKS
-from embit import ec
+from embit import 
 from io import BytesIO
 from binascii import unhexlify, hexlify, a2b_base64, b2a_base64
-from bcur import bcur_decode, cbor_decode, bc32decode, bc32encode, cbor_encode, bcur_encode
-from ur2.ur_decoder import URDecoder
-from ur2.ur_encoder import UREncoder
-from ur2.cbor_lite import CBOREncoder
-from ur2.ur import UR
 import re
 import textwrap
 

src/seedsigner/models/specter_desktop_multisig_wallet.py

@@ -1,15 +1,10 @@
-from wallet import Wallet
-from qr import QR
+from . import Wallet
+from seedsigner.helpers import QR
 
 # External Dependencies
-from embit.bip39 import mnemonic_to_bytes
-from embit.bip39 import mnemonic_from_bytes
-from embit import bip39
-from embit import script
-from embit import bip32
-from embit import psbt
+from embit import bip32, bip39, ec, psbt, script
+from embit.bip39 import mnemonic_to_bytes, mnemonic_from_bytes
 from embit.networks import NETWORKS
-from embit import ec
 from io import BytesIO
 from binascii import unhexlify, hexlify, a2b_base64, b2a_base64
 import re

src/seedsigner/models/specter_desktop_single_sig_wallet.py

@@ -1,15 +1,10 @@
-from specter_desktop_multisig_wallet import SpecterDesktopMultisigWallet
-from wallet import Wallet
+from . import SpecterDesktopMultisigWallet
+from . import Wallet
 
 # External Dependencies
-from embit.bip39 import mnemonic_to_bytes
-from embit.bip39 import mnemonic_from_bytes
-from embit import bip39
-from embit import script
-from embit import bip32
-from embit import psbt
+from embit import bip32, bip39, ec, psbt, script
+from embit.bip39 import mnemonic_to_bytes, mnemonic_from_bytes
 from embit.networks import NETWORKS
-from embit import ec
 from io import BytesIO
 from binascii import unhexlify, hexlify, a2b_base64, b2a_base64
 import re

src/seedsigner/models/wallet.py

@@ -1,19 +1,12 @@
 # Internal Dependencies
-from buttons import Buttons, B
-from camera_process import CameraProcess
-from camera_process import CameraPoll
-from view import View
+from seedsigner.helpers import Buttons, B, CameraProcess, CameraPoll
+from seedsigner.views import View
 
 # External Dependencies
 import time
-from embit.bip39 import mnemonic_to_bytes
-from embit.bip39 import mnemonic_from_bytes
-from embit import bip39
-from embit import script
-from embit import bip32
-from embit import psbt
+from embit import bip32, bip39, ec, psbt, script
+from embit.bip39 import mnemonic_to_bytes, mnemonic_from_bytes
 from embit.networks import NETWORKS
-from embit import ec
 from io import BytesIO
 from binascii import unhexlify, hexlify, a2b_base64, b2a_base64
 import textwrap

src/seedsigner/views/__init__.py

@@ -0,0 +1,6 @@
+from io_test_view import IOTestView
+from menu_view import MenuView
+from seed_tools_view import SeedToolsView
+from settings_tools_view import SettingsToolsView
+from signing_tools_view import SigningToolsView
+from view import View

src/seedsigner/views/io_test_view.py

@@ -3,9 +3,9 @@ import threading
 from threading import Timer
 
 # Internal file class dependencies
-from view import View
-from buttons import B
-from camera_process import CameraPoll
+from . import View
+from seedsigner.helpers import B, CameraPoll
+
 
 class IOTestView(View):
 

src/seedsigner/views/menu_view.py

@@ -1,8 +1,7 @@
 # Internal file class dependencies
-from view import View
-from buttons import B
-from path import Path
-from seed_storage import SeedStorage
+from . import View
+from seedsigner.helpers import B, Path
+from seedsigner.models import SeedStorage
 
 # External Dependencies
 import time

src/seedsigner/views/seed_tools_view.py

@@ -1,12 +1,12 @@
 # External Dependencies
-from embit.bip39 import mnemonic_to_bytes
-from embit.bip39 import mnemonic_from_bytes
 from embit import bip39
+from embit.bip39 import mnemonic_to_bytes, mnemonic_from_bytes
 import time
 
 # Internal file class dependencies
-from view import View
-from buttons import B
+from . import View
+from seedsigner.helpers import B
+
 
 class SeedToolsView(View):
 

src/seedsigner/views/settings_tools_view.py

@@ -1,7 +1,7 @@
 # SeedSigner file class dependencies
-from view import View
-from qr import QR
-from buttons import B
+from . import View
+from seedsigner.helpers import B, QR
+
 
 class SettingsToolsView(View):
 

src/seedsigner/views/signing_tools_view.py

@@ -1,10 +1,11 @@
 # Internal file class dependencies
-from view import View
-from buttons import Buttons, B
+from . import View
+from seedsigner.helpers import Buttons, B
 
 # External Dependencies
 import time
 
+
 class SigningToolsView(View):
 
     def __init__(self, controller, seed_storage) -> None:

src/seedsigner/views/view.py

@@ -1,11 +1,10 @@
 # External Dependencies
-from PIL import Image
-from PIL import ImageDraw
-from PIL import ImageFont
-import ST7789
+from PIL import Image, ImageDraw, ImageFont
 import spidev as SPI
 from multiprocessing import Queue
 
+from seedsigner.helpers import ST7789
+
 ### Generic View Class to Instatiate Display
 ### Static Class variables are used for display
 ### Designed to be inherited for other view classes, but not required