From af6977a23c2e0907ba34cf05771399a5d0e94115 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 7 Jun 2024 23:30:02 -0400 Subject: [PATCH] Fix imports for new package structure --- src/libWiiPy/archive/u8.py | 2 +- src/libWiiPy/title/content.py | 4 ++-- src/libWiiPy/title/crypto.py | 4 ++-- src/libWiiPy/title/nus.py | 6 +++--- src/libWiiPy/title/ticket.py | 4 ++-- src/libWiiPy/title/title.py | 8 ++++---- src/libWiiPy/title/tmd.py | 2 +- src/libWiiPy/title/wad.py | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libWiiPy/archive/u8.py b/src/libWiiPy/archive/u8.py index 3b0f812..97c9fc2 100644 --- a/src/libWiiPy/archive/u8.py +++ b/src/libWiiPy/archive/u8.py @@ -8,7 +8,7 @@ import os import pathlib from dataclasses import dataclass from typing import List -from src.libWiiPy.shared import align_value +from ..shared import align_value @dataclass diff --git a/src/libWiiPy/title/content.py b/src/libWiiPy/title/content.py index fb7554d..6e4af43 100644 --- a/src/libWiiPy/title/content.py +++ b/src/libWiiPy/title/content.py @@ -7,8 +7,8 @@ import io import sys import hashlib from typing import List -from src.libWiiPy.types import ContentRecord -from src.libWiiPy.title.crypto import decrypt_content, encrypt_content +from ..types import ContentRecord +from .crypto import decrypt_content, encrypt_content class ContentRegion: diff --git a/src/libWiiPy/title/crypto.py b/src/libWiiPy/title/crypto.py index 5f7d88c..d7e6f72 100644 --- a/src/libWiiPy/title/crypto.py +++ b/src/libWiiPy/title/crypto.py @@ -2,8 +2,8 @@ # https://github.com/NinjaCheetah/libWiiPy import struct -from src.libWiiPy.title.commonkeys import get_common_key -from src.libWiiPy.shared import convert_tid_to_iv +from .commonkeys import get_common_key +from ..shared import convert_tid_to_iv from Crypto.Cipher import AES diff --git a/src/libWiiPy/title/nus.py b/src/libWiiPy/title/nus.py index d9085c3..093627c 100644 --- a/src/libWiiPy/title/nus.py +++ b/src/libWiiPy/title/nus.py @@ -6,9 +6,9 @@ import requests import hashlib from typing import List -from src.libWiiPy.title.title import Title -from src.libWiiPy.title.tmd import TMD -from src.libWiiPy.title.ticket import Ticket +from .title import Title +from .tmd import TMD +from .ticket import Ticket nus_endpoint = ["http://nus.cdn.shop.wii.com/ccs/download/", "http://ccs.cdn.wup.shop.nintendo.net/ccs/download/"] diff --git a/src/libWiiPy/title/ticket.py b/src/libWiiPy/title/ticket.py index b81615a..405b290 100644 --- a/src/libWiiPy/title/ticket.py +++ b/src/libWiiPy/title/ticket.py @@ -5,8 +5,8 @@ import io import binascii -from src.libWiiPy.title.crypto import decrypt_title_key -from src.libWiiPy.types import TitleLimit +from .crypto import decrypt_title_key +from ..types import TitleLimit from typing import List diff --git a/src/libWiiPy/title/title.py b/src/libWiiPy/title/title.py index 5b5b5e7..fd4c1d4 100644 --- a/src/libWiiPy/title/title.py +++ b/src/libWiiPy/title/title.py @@ -3,10 +3,10 @@ # # See https://wiibrew.org/wiki/Title for details about how titles are formatted -from src.libWiiPy.title.content import ContentRegion -from src.libWiiPy.title.ticket import Ticket -from src.libWiiPy.title.tmd import TMD -from src.libWiiPy.title.wad import WAD +from .content import ContentRegion +from .ticket import Ticket +from .tmd import TMD +from .wad import WAD class Title: diff --git a/src/libWiiPy/title/tmd.py b/src/libWiiPy/title/tmd.py index bdc0bfa..c039473 100644 --- a/src/libWiiPy/title/tmd.py +++ b/src/libWiiPy/title/tmd.py @@ -7,7 +7,7 @@ import io import binascii import struct from typing import List -from src.libWiiPy.types import ContentRecord +from ..types import ContentRecord class TMD: diff --git a/src/libWiiPy/title/wad.py b/src/libWiiPy/title/wad.py index 9f86b57..a06412b 100644 --- a/src/libWiiPy/title/wad.py +++ b/src/libWiiPy/title/wad.py @@ -5,7 +5,7 @@ import io import binascii -from src.libWiiPy.shared import align_value, pad_bytes +from ..shared import align_value, pad_bytes class WAD: