From 14cb019aec1c73f49df1d0d5be355c68dcdb01d8 Mon Sep 17 00:00:00 2001 From: kdmukai Date: Wed, 23 Jun 2021 23:13:26 -0500 Subject: [PATCH] Standardizing imports --- {seedsigner => src}/main.py | 6 +--- {seedsigner => src/seedsigner}/controller.py | 19 +++--------- .../seedsigner}/helpers/ST7789.py | 0 src/seedsigner/helpers/__init__.py | 5 +++ .../seedsigner}/helpers/bcur.py | 0 .../seedsigner}/helpers/buttons.py | 0 .../seedsigner}/helpers/camera_process.py | 0 .../seedsigner}/helpers/path.py | 0 {seedsigner => src/seedsigner}/helpers/qr.py | 0 .../seedsigner}/helpers/ur2/LICENSE | 0 .../seedsigner}/helpers/ur2/__init__.py | 0 .../seedsigner}/helpers/ur2/bytewords.py | 0 .../seedsigner}/helpers/ur2/cbor_lite.py | 0 .../seedsigner}/helpers/ur2/constants.py | 0 .../seedsigner}/helpers/ur2/crc32.py | 0 .../helpers/ur2/fountain_decoder.py | 0 .../helpers/ur2/fountain_encoder.py | 0 .../seedsigner}/helpers/ur2/fountain_utils.py | 0 .../seedsigner}/helpers/ur2/random_sampler.py | 0 .../seedsigner}/helpers/ur2/ur.py | 0 .../seedsigner}/helpers/ur2/ur_decoder.py | 0 .../seedsigner}/helpers/ur2/ur_encoder.py | 0 .../seedsigner}/helpers/ur2/utils.py | 0 .../seedsigner}/helpers/ur2/xoshiro256.py | 0 src/seedsigner/models/__init__.py | 6 ++++ .../seedsigner}/models/blue_vault_wallet.py | 7 +++-- .../seedsigner}/models/generic_ur2_wallet.py | 20 ++++++------ .../seedsigner}/models/seed_storage.py | 3 +- .../models/sparrow_multisig_wallet.py | 31 ++++++++----------- .../models/specter_desktop_multisig_wallet.py | 13 +++----- .../specter_desktop_single_sig_wallet.py | 13 +++----- .../seedsigner}/models/wallet.py | 15 +++------ {seedsigner => src/seedsigner}/settings.ini | 0 src/seedsigner/views/__init__.py | 6 ++++ .../seedsigner}/views/io_test_view.py | 6 ++-- .../seedsigner}/views/menu_view.py | 7 ++--- .../seedsigner}/views/seed_tools_view.py | 8 ++--- .../seedsigner}/views/settings_tools_view.py | 6 ++-- .../seedsigner}/views/signing_tools_view.py | 5 +-- {seedsigner => src/seedsigner}/views/view.py | 7 ++--- 40 files changed, 81 insertions(+), 102 deletions(-) rename {seedsigner => src}/main.py (57%) rename {seedsigner => src/seedsigner}/controller.py (96%) rename {seedsigner => src/seedsigner}/helpers/ST7789.py (100%) create mode 100644 src/seedsigner/helpers/__init__.py rename {seedsigner => src/seedsigner}/helpers/bcur.py (100%) rename {seedsigner => src/seedsigner}/helpers/buttons.py (100%) rename {seedsigner => src/seedsigner}/helpers/camera_process.py (100%) rename {seedsigner => src/seedsigner}/helpers/path.py (100%) rename {seedsigner => src/seedsigner}/helpers/qr.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/LICENSE (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/__init__.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/bytewords.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/cbor_lite.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/constants.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/crc32.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/fountain_decoder.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/fountain_encoder.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/fountain_utils.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/random_sampler.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/ur.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/ur_decoder.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/ur_encoder.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/utils.py (100%) rename {seedsigner => src/seedsigner}/helpers/ur2/xoshiro256.py (100%) create mode 100644 src/seedsigner/models/__init__.py rename {seedsigner => src/seedsigner}/models/blue_vault_wallet.py (96%) rename {seedsigner => src/seedsigner}/models/generic_ur2_wallet.py (93%) rename {seedsigner => src/seedsigner}/models/seed_storage.py (97%) rename {seedsigner => src/seedsigner}/models/sparrow_multisig_wallet.py (91%) rename {seedsigner => src/seedsigner}/models/specter_desktop_multisig_wallet.py (93%) rename {seedsigner => src/seedsigner}/models/specter_desktop_single_sig_wallet.py (77%) rename {seedsigner => src/seedsigner}/models/wallet.py (97%) rename {seedsigner => src/seedsigner}/settings.ini (100%) create mode 100644 src/seedsigner/views/__init__.py rename {seedsigner => src/seedsigner}/views/io_test_view.py (98%) rename {seedsigner => src/seedsigner}/views/menu_view.py (99%) rename {seedsigner => src/seedsigner}/views/seed_tools_view.py (99%) rename {seedsigner => src/seedsigner}/views/settings_tools_view.py (97%) rename {seedsigner => src/seedsigner}/views/signing_tools_view.py (98%) rename {seedsigner => src/seedsigner}/views/view.py (99%) diff --git a/seedsigner/main.py b/src/main.py similarity index 57% rename from seedsigner/main.py rename to src/main.py index 8b898ed2..1bb2a4b2 100644 --- a/seedsigner/main.py +++ b/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() diff --git a/seedsigner/controller.py b/src/seedsigner/controller.py similarity index 96% rename from seedsigner/controller.py rename to src/seedsigner/controller.py index 5c27e406..0313ba1b 100644 --- a/seedsigner/controller.py +++ b/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: diff --git a/seedsigner/helpers/ST7789.py b/src/seedsigner/helpers/ST7789.py similarity index 100% rename from seedsigner/helpers/ST7789.py rename to src/seedsigner/helpers/ST7789.py diff --git a/src/seedsigner/helpers/__init__.py b/src/seedsigner/helpers/__init__.py new file mode 100644 index 00000000..d7ac320b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/seedsigner/helpers/bcur.py b/src/seedsigner/helpers/bcur.py similarity index 100% rename from seedsigner/helpers/bcur.py rename to src/seedsigner/helpers/bcur.py diff --git a/seedsigner/helpers/buttons.py b/src/seedsigner/helpers/buttons.py similarity index 100% rename from seedsigner/helpers/buttons.py rename to src/seedsigner/helpers/buttons.py diff --git a/seedsigner/helpers/camera_process.py b/src/seedsigner/helpers/camera_process.py similarity index 100% rename from seedsigner/helpers/camera_process.py rename to src/seedsigner/helpers/camera_process.py diff --git a/seedsigner/helpers/path.py b/src/seedsigner/helpers/path.py similarity index 100% rename from seedsigner/helpers/path.py rename to src/seedsigner/helpers/path.py diff --git a/seedsigner/helpers/qr.py b/src/seedsigner/helpers/qr.py similarity index 100% rename from seedsigner/helpers/qr.py rename to src/seedsigner/helpers/qr.py diff --git a/seedsigner/helpers/ur2/LICENSE b/src/seedsigner/helpers/ur2/LICENSE similarity index 100% rename from seedsigner/helpers/ur2/LICENSE rename to src/seedsigner/helpers/ur2/LICENSE diff --git a/seedsigner/helpers/ur2/__init__.py b/src/seedsigner/helpers/ur2/__init__.py similarity index 100% rename from seedsigner/helpers/ur2/__init__.py rename to src/seedsigner/helpers/ur2/__init__.py diff --git a/seedsigner/helpers/ur2/bytewords.py b/src/seedsigner/helpers/ur2/bytewords.py similarity index 100% rename from seedsigner/helpers/ur2/bytewords.py rename to src/seedsigner/helpers/ur2/bytewords.py diff --git a/seedsigner/helpers/ur2/cbor_lite.py b/src/seedsigner/helpers/ur2/cbor_lite.py similarity index 100% rename from seedsigner/helpers/ur2/cbor_lite.py rename to src/seedsigner/helpers/ur2/cbor_lite.py diff --git a/seedsigner/helpers/ur2/constants.py b/src/seedsigner/helpers/ur2/constants.py similarity index 100% rename from seedsigner/helpers/ur2/constants.py rename to src/seedsigner/helpers/ur2/constants.py diff --git a/seedsigner/helpers/ur2/crc32.py b/src/seedsigner/helpers/ur2/crc32.py similarity index 100% rename from seedsigner/helpers/ur2/crc32.py rename to src/seedsigner/helpers/ur2/crc32.py diff --git a/seedsigner/helpers/ur2/fountain_decoder.py b/src/seedsigner/helpers/ur2/fountain_decoder.py similarity index 100% rename from seedsigner/helpers/ur2/fountain_decoder.py rename to src/seedsigner/helpers/ur2/fountain_decoder.py diff --git a/seedsigner/helpers/ur2/fountain_encoder.py b/src/seedsigner/helpers/ur2/fountain_encoder.py similarity index 100% rename from seedsigner/helpers/ur2/fountain_encoder.py rename to src/seedsigner/helpers/ur2/fountain_encoder.py diff --git a/seedsigner/helpers/ur2/fountain_utils.py b/src/seedsigner/helpers/ur2/fountain_utils.py similarity index 100% rename from seedsigner/helpers/ur2/fountain_utils.py rename to src/seedsigner/helpers/ur2/fountain_utils.py diff --git a/seedsigner/helpers/ur2/random_sampler.py b/src/seedsigner/helpers/ur2/random_sampler.py similarity index 100% rename from seedsigner/helpers/ur2/random_sampler.py rename to src/seedsigner/helpers/ur2/random_sampler.py diff --git a/seedsigner/helpers/ur2/ur.py b/src/seedsigner/helpers/ur2/ur.py similarity index 100% rename from seedsigner/helpers/ur2/ur.py rename to src/seedsigner/helpers/ur2/ur.py diff --git a/seedsigner/helpers/ur2/ur_decoder.py b/src/seedsigner/helpers/ur2/ur_decoder.py similarity index 100% rename from seedsigner/helpers/ur2/ur_decoder.py rename to src/seedsigner/helpers/ur2/ur_decoder.py diff --git a/seedsigner/helpers/ur2/ur_encoder.py b/src/seedsigner/helpers/ur2/ur_encoder.py similarity index 100% rename from seedsigner/helpers/ur2/ur_encoder.py rename to src/seedsigner/helpers/ur2/ur_encoder.py diff --git a/seedsigner/helpers/ur2/utils.py b/src/seedsigner/helpers/ur2/utils.py similarity index 100% rename from seedsigner/helpers/ur2/utils.py rename to src/seedsigner/helpers/ur2/utils.py diff --git a/seedsigner/helpers/ur2/xoshiro256.py b/src/seedsigner/helpers/ur2/xoshiro256.py similarity index 100% rename from seedsigner/helpers/ur2/xoshiro256.py rename to src/seedsigner/helpers/ur2/xoshiro256.py diff --git a/src/seedsigner/models/__init__.py b/src/seedsigner/models/__init__.py new file mode 100644 index 00000000..9a9ef1aa --- /dev/null +++ b/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 diff --git a/seedsigner/models/blue_vault_wallet.py b/src/seedsigner/models/blue_vault_wallet.py similarity index 96% rename from seedsigner/models/blue_vault_wallet.py rename to src/seedsigner/models/blue_vault_wallet.py index 09c6ac71..97347675 100644 --- a/seedsigner/models/blue_vault_wallet.py +++ b/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): diff --git a/seedsigner/models/generic_ur2_wallet.py b/src/seedsigner/models/generic_ur2_wallet.py similarity index 93% rename from seedsigner/models/generic_ur2_wallet.py rename to src/seedsigner/models/generic_ur2_wallet.py index 7dab9ecf..9896e9d3 100644 --- a/seedsigner/models/generic_ur2_wallet.py +++ b/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 diff --git a/seedsigner/models/seed_storage.py b/src/seedsigner/models/seed_storage.py similarity index 97% rename from seedsigner/models/seed_storage.py rename to src/seedsigner/models/seed_storage.py index 1a9a865a..ebb08eac 100644 --- a/seedsigner/models/seed_storage.py +++ b/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: diff --git a/seedsigner/models/sparrow_multisig_wallet.py b/src/seedsigner/models/sparrow_multisig_wallet.py similarity index 91% rename from seedsigner/models/sparrow_multisig_wallet.py rename to src/seedsigner/models/sparrow_multisig_wallet.py index f5faaf65..7528fcf6 100644 --- a/seedsigner/models/sparrow_multisig_wallet.py +++ b/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 diff --git a/seedsigner/models/specter_desktop_multisig_wallet.py b/src/seedsigner/models/specter_desktop_multisig_wallet.py similarity index 93% rename from seedsigner/models/specter_desktop_multisig_wallet.py rename to src/seedsigner/models/specter_desktop_multisig_wallet.py index 79be1743..a57a041c 100644 --- a/seedsigner/models/specter_desktop_multisig_wallet.py +++ b/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 diff --git a/seedsigner/models/specter_desktop_single_sig_wallet.py b/src/seedsigner/models/specter_desktop_single_sig_wallet.py similarity index 77% rename from seedsigner/models/specter_desktop_single_sig_wallet.py rename to src/seedsigner/models/specter_desktop_single_sig_wallet.py index b7feddcd..725ac9ec 100644 --- a/seedsigner/models/specter_desktop_single_sig_wallet.py +++ b/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 diff --git a/seedsigner/models/wallet.py b/src/seedsigner/models/wallet.py similarity index 97% rename from seedsigner/models/wallet.py rename to src/seedsigner/models/wallet.py index acc24186..94d435b8 100644 --- a/seedsigner/models/wallet.py +++ b/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 diff --git a/seedsigner/settings.ini b/src/seedsigner/settings.ini similarity index 100% rename from seedsigner/settings.ini rename to src/seedsigner/settings.ini diff --git a/src/seedsigner/views/__init__.py b/src/seedsigner/views/__init__.py new file mode 100644 index 00000000..2b315cab --- /dev/null +++ b/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 diff --git a/seedsigner/views/io_test_view.py b/src/seedsigner/views/io_test_view.py similarity index 98% rename from seedsigner/views/io_test_view.py rename to src/seedsigner/views/io_test_view.py index 887792d1..c69f6a47 100644 --- a/seedsigner/views/io_test_view.py +++ b/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): diff --git a/seedsigner/views/menu_view.py b/src/seedsigner/views/menu_view.py similarity index 99% rename from seedsigner/views/menu_view.py rename to src/seedsigner/views/menu_view.py index 9667cbe6..da210a22 100644 --- a/seedsigner/views/menu_view.py +++ b/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 diff --git a/seedsigner/views/seed_tools_view.py b/src/seedsigner/views/seed_tools_view.py similarity index 99% rename from seedsigner/views/seed_tools_view.py rename to src/seedsigner/views/seed_tools_view.py index 36f265a5..e6551090 100644 --- a/seedsigner/views/seed_tools_view.py +++ b/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): diff --git a/seedsigner/views/settings_tools_view.py b/src/seedsigner/views/settings_tools_view.py similarity index 97% rename from seedsigner/views/settings_tools_view.py rename to src/seedsigner/views/settings_tools_view.py index 6d0f545a..110f798e 100644 --- a/seedsigner/views/settings_tools_view.py +++ b/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): diff --git a/seedsigner/views/signing_tools_view.py b/src/seedsigner/views/signing_tools_view.py similarity index 98% rename from seedsigner/views/signing_tools_view.py rename to src/seedsigner/views/signing_tools_view.py index 5b925af3..61954d83 100644 --- a/seedsigner/views/signing_tools_view.py +++ b/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: diff --git a/seedsigner/views/view.py b/src/seedsigner/views/view.py similarity index 99% rename from seedsigner/views/view.py rename to src/seedsigner/views/view.py index 5f46cf70..4e84ad3e 100644 --- a/seedsigner/views/view.py +++ b/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