From 83fec2952ed110b18572c4fd40d56ae875f7d5cb Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Mon, 1 Apr 2024 11:15:34 -0600 Subject: [PATCH] Move utilities directory to support --- opencore_legacy_patcher/application_entry.py | 2 +- opencore_legacy_patcher/detections/amfi_detect.py | 2 +- opencore_legacy_patcher/detections/device_probe.py | 5 +++-- opencore_legacy_patcher/efi_builder/build.py | 2 +- opencore_legacy_patcher/efi_builder/firmware.py | 2 +- .../efi_builder/graphics_audio.py | 2 +- opencore_legacy_patcher/efi_builder/misc.py | 2 +- .../efi_builder/networking/wireless.py | 2 +- opencore_legacy_patcher/efi_builder/security.py | 2 +- opencore_legacy_patcher/efi_builder/smbios.py | 2 +- opencore_legacy_patcher/efi_builder/storage.py | 2 +- .../{utilities => support}/analytics_handler.py | 2 +- .../{utilities => support}/arguments.py | 2 +- .../{utilities => support}/bplist.py | 0 .../{utilities => support}/commit_info.py | 0 .../{utilities => support}/defaults.py | 2 +- .../{utilities => support}/generate_smbios.py | 2 +- .../{utilities => support}/global_settings.py | 0 .../{utilities => support}/install.py | 3 ++- .../integrity_verification.py | 0 .../{utilities => support}/kdk_handler.py | 2 +- .../{utilities => support}/logging_handler.py | 2 +- .../macos_installer_handler.py | 2 +- .../{utilities => support}/network_handler.py | 2 +- .../{utilities => support}/reroute_payloads.py | 0 .../{utilities => support}/updates.py | 4 ++-- .../{utilities => support}/utilities.py | 0 .../{utilities => support}/validation.py | 3 ++- opencore_legacy_patcher/sys_patch/sys_patch.py | 13 +++++++++++-- opencore_legacy_patcher/sys_patch/sys_patch_auto.py | 5 +++-- .../sys_patch/sys_patch_detect.py | 2 +- .../sys_patch/sys_patch_generate.py | 2 +- .../sys_patch/sys_patch_helpers.py | 2 +- .../wx_gui/gui_cache_os_update.py | 2 +- opencore_legacy_patcher/wx_gui/gui_download.py | 2 +- opencore_legacy_patcher/wx_gui/gui_install_oc.py | 2 +- .../wx_gui/gui_macos_installer_download.py | 2 +- .../wx_gui/gui_macos_installer_flash.py | 2 +- opencore_legacy_patcher/wx_gui/gui_main_menu.py | 2 +- opencore_legacy_patcher/wx_gui/gui_settings.py | 2 +- .../wx_gui/gui_sys_patch_start.py | 2 +- opencore_legacy_patcher/wx_gui/gui_update.py | 2 +- 42 files changed, 53 insertions(+), 40 deletions(-) rename opencore_legacy_patcher/{utilities => support}/analytics_handler.py (99%) rename opencore_legacy_patcher/{utilities => support}/arguments.py (99%) rename opencore_legacy_patcher/{utilities => support}/bplist.py (100%) rename opencore_legacy_patcher/{utilities => support}/commit_info.py (100%) rename opencore_legacy_patcher/{utilities => support}/defaults.py (99%) rename opencore_legacy_patcher/{utilities => support}/generate_smbios.py (99%) rename opencore_legacy_patcher/{utilities => support}/global_settings.py (100%) rename opencore_legacy_patcher/{utilities => support}/install.py (99%) rename opencore_legacy_patcher/{utilities => support}/integrity_verification.py (100%) rename opencore_legacy_patcher/{utilities => support}/kdk_handler.py (99%) rename opencore_legacy_patcher/{utilities => support}/logging_handler.py (99%) rename opencore_legacy_patcher/{utilities => support}/macos_installer_handler.py (99%) rename opencore_legacy_patcher/{utilities => support}/network_handler.py (99%) rename opencore_legacy_patcher/{utilities => support}/reroute_payloads.py (100%) rename opencore_legacy_patcher/{utilities => support}/updates.py (99%) rename opencore_legacy_patcher/{utilities => support}/utilities.py (100%) rename opencore_legacy_patcher/{utilities => support}/validation.py (99%) diff --git a/opencore_legacy_patcher/application_entry.py b/opencore_legacy_patcher/application_entry.py index df30d2165..4a950b634 100644 --- a/opencore_legacy_patcher/application_entry.py +++ b/opencore_legacy_patcher/application_entry.py @@ -18,7 +18,7 @@ from .detections import ( device_probe, os_probe ) -from .utilities import ( +from .support import ( utilities, defaults, arguments, diff --git a/opencore_legacy_patcher/detections/amfi_detect.py b/opencore_legacy_patcher/detections/amfi_detect.py index 127df2540..0b2122287 100644 --- a/opencore_legacy_patcher/detections/amfi_detect.py +++ b/opencore_legacy_patcher/detections/amfi_detect.py @@ -4,7 +4,7 @@ amfi_detect.py: Determine AppleMobileFileIntegrity's OS configuration import enum -from ..utilities import utilities +from ..support import utilities from ..datasets import amfi_data diff --git a/opencore_legacy_patcher/detections/device_probe.py b/opencore_legacy_patcher/detections/device_probe.py index 3ed75288e..b17f1b36a 100644 --- a/opencore_legacy_patcher/detections/device_probe.py +++ b/opencore_legacy_patcher/detections/device_probe.py @@ -12,8 +12,9 @@ from pathlib import Path from dataclasses import dataclass, field from typing import Any, ClassVar, Optional, Type, Union -from ..utilities import utilities -from ..detections import ioreg +from . import ioreg + +from ..support import utilities from ..datasets import ( pci_data, diff --git a/opencore_legacy_patcher/efi_builder/build.py b/opencore_legacy_patcher/efi_builder/build.py index 06772c557..568b3bcea 100644 --- a/opencore_legacy_patcher/efi_builder/build.py +++ b/opencore_legacy_patcher/efi_builder/build.py @@ -14,7 +14,7 @@ from datetime import date from .. import constants -from ..utilities import utilities +from ..support import utilities from .networking import ( wired, diff --git a/opencore_legacy_patcher/efi_builder/firmware.py b/opencore_legacy_patcher/efi_builder/firmware.py index 181997959..e6efee743 100644 --- a/opencore_legacy_patcher/efi_builder/firmware.py +++ b/opencore_legacy_patcher/efi_builder/firmware.py @@ -12,7 +12,7 @@ from . import support from .. import constants -from ..utilities import generate_smbios +from ..support import generate_smbios from ..detections import device_probe from ..datasets import ( diff --git a/opencore_legacy_patcher/efi_builder/graphics_audio.py b/opencore_legacy_patcher/efi_builder/graphics_audio.py index 214753b16..dce88af68 100644 --- a/opencore_legacy_patcher/efi_builder/graphics_audio.py +++ b/opencore_legacy_patcher/efi_builder/graphics_audio.py @@ -12,7 +12,7 @@ from . import support from .. import constants -from ..utilities import utilities +from ..support import utilities from ..detections import device_probe from ..datasets import ( diff --git a/opencore_legacy_patcher/efi_builder/misc.py b/opencore_legacy_patcher/efi_builder/misc.py index 76b0cecdb..2334fff49 100644 --- a/opencore_legacy_patcher/efi_builder/misc.py +++ b/opencore_legacy_patcher/efi_builder/misc.py @@ -12,7 +12,7 @@ from . import support from .. import constants -from ..utilities import generate_smbios +from ..support import generate_smbios from ..detections import device_probe from ..datasets import ( diff --git a/opencore_legacy_patcher/efi_builder/networking/wireless.py b/opencore_legacy_patcher/efi_builder/networking/wireless.py index a912ff428..c52313b55 100644 --- a/opencore_legacy_patcher/efi_builder/networking/wireless.py +++ b/opencore_legacy_patcher/efi_builder/networking/wireless.py @@ -9,7 +9,7 @@ from .. import support from ... import constants from ...datasets import smbios_data -from ...utilities import utilities +from ...support import utilities from ...detections import device_probe diff --git a/opencore_legacy_patcher/efi_builder/security.py b/opencore_legacy_patcher/efi_builder/security.py index f50f1c047..6eb1819d5 100644 --- a/opencore_legacy_patcher/efi_builder/security.py +++ b/opencore_legacy_patcher/efi_builder/security.py @@ -9,7 +9,7 @@ from . import support from .. import constants -from ..utilities import utilities +from ..support import utilities from ..detections import device_probe diff --git a/opencore_legacy_patcher/efi_builder/smbios.py b/opencore_legacy_patcher/efi_builder/smbios.py index b5f49e1ec..e692e0b9b 100644 --- a/opencore_legacy_patcher/efi_builder/smbios.py +++ b/opencore_legacy_patcher/efi_builder/smbios.py @@ -15,7 +15,7 @@ from . import support from .. import constants -from ..utilities import ( +from ..support import ( utilities, generate_smbios ) diff --git a/opencore_legacy_patcher/efi_builder/storage.py b/opencore_legacy_patcher/efi_builder/storage.py index 77a4d6607..e7b10410f 100644 --- a/opencore_legacy_patcher/efi_builder/storage.py +++ b/opencore_legacy_patcher/efi_builder/storage.py @@ -8,7 +8,7 @@ from . import support from .. import constants -from ..utilities import utilities +from ..support import utilities from ..detections import device_probe from ..datasets import ( diff --git a/opencore_legacy_patcher/utilities/analytics_handler.py b/opencore_legacy_patcher/support/analytics_handler.py similarity index 99% rename from opencore_legacy_patcher/utilities/analytics_handler.py rename to opencore_legacy_patcher/support/analytics_handler.py index 1d07b0da6..93813365d 100644 --- a/opencore_legacy_patcher/utilities/analytics_handler.py +++ b/opencore_legacy_patcher/support/analytics_handler.py @@ -10,7 +10,7 @@ from pathlib import Path from .. import constants -from ..utilities import ( +from . import ( network_handler, global_settings ) diff --git a/opencore_legacy_patcher/utilities/arguments.py b/opencore_legacy_patcher/support/arguments.py similarity index 99% rename from opencore_legacy_patcher/utilities/arguments.py rename to opencore_legacy_patcher/support/arguments.py index 55e962f8a..e95cb729e 100644 --- a/opencore_legacy_patcher/utilities/arguments.py +++ b/opencore_legacy_patcher/support/arguments.py @@ -24,7 +24,7 @@ from ..sys_patch import ( sys_patch, sys_patch_auto ) -from ..utilities import ( +from . import ( utilities, defaults, validation diff --git a/opencore_legacy_patcher/utilities/bplist.py b/opencore_legacy_patcher/support/bplist.py similarity index 100% rename from opencore_legacy_patcher/utilities/bplist.py rename to opencore_legacy_patcher/support/bplist.py diff --git a/opencore_legacy_patcher/utilities/commit_info.py b/opencore_legacy_patcher/support/commit_info.py similarity index 100% rename from opencore_legacy_patcher/utilities/commit_info.py rename to opencore_legacy_patcher/support/commit_info.py diff --git a/opencore_legacy_patcher/utilities/defaults.py b/opencore_legacy_patcher/support/defaults.py similarity index 99% rename from opencore_legacy_patcher/utilities/defaults.py rename to opencore_legacy_patcher/support/defaults.py index 0b8387a9c..19d34b960 100644 --- a/opencore_legacy_patcher/utilities/defaults.py +++ b/opencore_legacy_patcher/support/defaults.py @@ -8,7 +8,7 @@ from .. import constants from ..detections import device_probe -from ..utilities import ( +from . import ( utilities, generate_smbios, global_settings diff --git a/opencore_legacy_patcher/utilities/generate_smbios.py b/opencore_legacy_patcher/support/generate_smbios.py similarity index 99% rename from opencore_legacy_patcher/utilities/generate_smbios.py rename to opencore_legacy_patcher/support/generate_smbios.py index 992641544..a4100aaeb 100644 --- a/opencore_legacy_patcher/utilities/generate_smbios.py +++ b/opencore_legacy_patcher/support/generate_smbios.py @@ -4,7 +4,7 @@ generate_smbios.py: SMBIOS generation for OpenCore Legacy Patcher import logging -from ..utilities import utilities +from . import utilities from ..datasets import ( smbios_data, diff --git a/opencore_legacy_patcher/utilities/global_settings.py b/opencore_legacy_patcher/support/global_settings.py similarity index 100% rename from opencore_legacy_patcher/utilities/global_settings.py rename to opencore_legacy_patcher/support/global_settings.py diff --git a/opencore_legacy_patcher/utilities/install.py b/opencore_legacy_patcher/support/install.py similarity index 99% rename from opencore_legacy_patcher/utilities/install.py rename to opencore_legacy_patcher/support/install.py index f27455d98..9bb45c3f8 100644 --- a/opencore_legacy_patcher/utilities/install.py +++ b/opencore_legacy_patcher/support/install.py @@ -9,10 +9,11 @@ import applescript from pathlib import Path +from . import utilities + from .. import constants from ..datasets import os_data -from ..utilities import utilities class tui_disk_installation: diff --git a/opencore_legacy_patcher/utilities/integrity_verification.py b/opencore_legacy_patcher/support/integrity_verification.py similarity index 100% rename from opencore_legacy_patcher/utilities/integrity_verification.py rename to opencore_legacy_patcher/support/integrity_verification.py diff --git a/opencore_legacy_patcher/utilities/kdk_handler.py b/opencore_legacy_patcher/support/kdk_handler.py similarity index 99% rename from opencore_legacy_patcher/utilities/kdk_handler.py rename to opencore_legacy_patcher/support/kdk_handler.py index 380fca5b9..d99897b47 100644 --- a/opencore_legacy_patcher/utilities/kdk_handler.py +++ b/opencore_legacy_patcher/support/kdk_handler.py @@ -17,7 +17,7 @@ from .. import constants from ..datasets import os_data -from ..utilities import ( +from . import ( utilities, network_handler ) diff --git a/opencore_legacy_patcher/utilities/logging_handler.py b/opencore_legacy_patcher/support/logging_handler.py similarity index 99% rename from opencore_legacy_patcher/utilities/logging_handler.py rename to opencore_legacy_patcher/support/logging_handler.py index 464a87bbd..65ad16131 100644 --- a/opencore_legacy_patcher/utilities/logging_handler.py +++ b/opencore_legacy_patcher/support/logging_handler.py @@ -16,7 +16,7 @@ from datetime import datetime from .. import constants -from ..utilities import ( +from . import ( analytics_handler, global_settings ) diff --git a/opencore_legacy_patcher/utilities/macos_installer_handler.py b/opencore_legacy_patcher/support/macos_installer_handler.py similarity index 99% rename from opencore_legacy_patcher/utilities/macos_installer_handler.py rename to opencore_legacy_patcher/support/macos_installer_handler.py index b75ddc7f9..e1459d0c6 100644 --- a/opencore_legacy_patcher/utilities/macos_installer_handler.py +++ b/opencore_legacy_patcher/support/macos_installer_handler.py @@ -13,7 +13,7 @@ from pathlib import Path from ..datasets import os_data -from ..utilities import ( +from . import ( network_handler, utilities ) diff --git a/opencore_legacy_patcher/utilities/network_handler.py b/opencore_legacy_patcher/support/network_handler.py similarity index 99% rename from opencore_legacy_patcher/utilities/network_handler.py rename to opencore_legacy_patcher/support/network_handler.py index c9623f426..522f40b07 100644 --- a/opencore_legacy_patcher/utilities/network_handler.py +++ b/opencore_legacy_patcher/support/network_handler.py @@ -16,7 +16,7 @@ import atexit from typing import Union from pathlib import Path -from ..utilities import utilities +from . import utilities SESSION = requests.Session() diff --git a/opencore_legacy_patcher/utilities/reroute_payloads.py b/opencore_legacy_patcher/support/reroute_payloads.py similarity index 100% rename from opencore_legacy_patcher/utilities/reroute_payloads.py rename to opencore_legacy_patcher/support/reroute_payloads.py diff --git a/opencore_legacy_patcher/utilities/updates.py b/opencore_legacy_patcher/support/updates.py similarity index 99% rename from opencore_legacy_patcher/utilities/updates.py rename to opencore_legacy_patcher/support/updates.py index 3a85c83db..4e5e220e5 100644 --- a/opencore_legacy_patcher/utilities/updates.py +++ b/opencore_legacy_patcher/support/updates.py @@ -10,9 +10,9 @@ import logging from typing import Optional, Union from packaging import version -from .. import constants +from . import network_handler -from ..utilities import network_handler +from .. import constants REPO_LATEST_RELEASE_URL: str = "https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest" diff --git a/opencore_legacy_patcher/utilities/utilities.py b/opencore_legacy_patcher/support/utilities.py similarity index 100% rename from opencore_legacy_patcher/utilities/utilities.py rename to opencore_legacy_patcher/support/utilities.py diff --git a/opencore_legacy_patcher/utilities/validation.py b/opencore_legacy_patcher/support/validation.py similarity index 99% rename from opencore_legacy_patcher/utilities/validation.py rename to opencore_legacy_patcher/support/validation.py index 89c806cd0..d4fb8ef44 100644 --- a/opencore_legacy_patcher/utilities/validation.py +++ b/opencore_legacy_patcher/support/validation.py @@ -7,10 +7,11 @@ import subprocess from pathlib import Path +from . import network_handler + from .. import constants from ..sys_patch import sys_patch_helpers -from ..utilities import network_handler from ..efi_builder import build from ..datasets import ( diff --git a/opencore_legacy_patcher/sys_patch/sys_patch.py b/opencore_legacy_patcher/sys_patch/sys_patch.py index cd1d6d936..f701c28be 100644 --- a/opencore_legacy_patcher/sys_patch/sys_patch.py +++ b/opencore_legacy_patcher/sys_patch/sys_patch.py @@ -44,11 +44,20 @@ from pathlib import Path from datetime import datetime from .. import constants -from ..utilities import utilities, kdk_handler -from ..sys_patch import sys_patch_detect, sys_patch_auto, sys_patch_helpers, sys_patch_generate from ..datasets import os_data +from ..support import ( + utilities, + kdk_handler +) +from . import ( + sys_patch_detect, + sys_patch_auto, + sys_patch_helpers, + sys_patch_generate +) + class PatchSysVolume: def __init__(self, model: str, global_constants: constants.Constants, hardware_details: list = None) -> None: diff --git a/opencore_legacy_patcher/sys_patch/sys_patch_auto.py b/opencore_legacy_patcher/sys_patch/sys_patch_auto.py index ece222a26..dd703e7c5 100644 --- a/opencore_legacy_patcher/sys_patch/sys_patch_auto.py +++ b/opencore_legacy_patcher/sys_patch/sys_patch_auto.py @@ -15,16 +15,17 @@ import webbrowser from pathlib import Path +from . import sys_patch_detect + from .. import constants from ..datasets import css_data -from ..sys_patch import sys_patch_detect from ..wx_gui import ( gui_entry, gui_support ) -from ..utilities import ( +from ..support import ( utilities, updates, global_settings, diff --git a/opencore_legacy_patcher/sys_patch/sys_patch_detect.py b/opencore_legacy_patcher/sys_patch/sys_patch_detect.py index 3557a9506..abdbe4325 100644 --- a/opencore_legacy_patcher/sys_patch/sys_patch_detect.py +++ b/opencore_legacy_patcher/sys_patch/sys_patch_detect.py @@ -15,7 +15,7 @@ from ..detections import ( amfi_detect, device_probe ) -from ..utilities import ( +from ..support import ( kdk_handler, network_handler, utilities diff --git a/opencore_legacy_patcher/sys_patch/sys_patch_generate.py b/opencore_legacy_patcher/sys_patch/sys_patch_generate.py index 1a628b1e6..77ecb3a4c 100644 --- a/opencore_legacy_patcher/sys_patch/sys_patch_generate.py +++ b/opencore_legacy_patcher/sys_patch/sys_patch_generate.py @@ -7,7 +7,7 @@ import logging from .. import constants from ..datasets import sys_patch_dict -from ..utilities import utilities +from ..support import utilities from ..detections import device_probe diff --git a/opencore_legacy_patcher/sys_patch/sys_patch_helpers.py b/opencore_legacy_patcher/sys_patch/sys_patch_helpers.py index 7fe8c85ab..047f0b0d4 100644 --- a/opencore_legacy_patcher/sys_patch/sys_patch_helpers.py +++ b/opencore_legacy_patcher/sys_patch/sys_patch_helpers.py @@ -15,7 +15,7 @@ from .. import constants from ..datasets import os_data -from ..utilities import ( +from ..support import ( bplist, generate_smbios, utilities diff --git a/opencore_legacy_patcher/wx_gui/gui_cache_os_update.py b/opencore_legacy_patcher/wx_gui/gui_cache_os_update.py index 8ff651492..1f3f0e39d 100644 --- a/opencore_legacy_patcher/wx_gui/gui_cache_os_update.py +++ b/opencore_legacy_patcher/wx_gui/gui_cache_os_update.py @@ -12,7 +12,7 @@ import threading from pathlib import Path from .. import constants -from ..utilities import kdk_handler, utilities +from ..support import kdk_handler, utilities from ..wx_gui import gui_support, gui_download diff --git a/opencore_legacy_patcher/wx_gui/gui_download.py b/opencore_legacy_patcher/wx_gui/gui_download.py index 910117898..aca36e9aa 100644 --- a/opencore_legacy_patcher/wx_gui/gui_download.py +++ b/opencore_legacy_patcher/wx_gui/gui_download.py @@ -9,7 +9,7 @@ from .. import constants from ..wx_gui import gui_support -from ..utilities import ( +from ..support import ( network_handler, utilities ) diff --git a/opencore_legacy_patcher/wx_gui/gui_install_oc.py b/opencore_legacy_patcher/wx_gui/gui_install_oc.py index e45aacf5b..af4fa413c 100644 --- a/opencore_legacy_patcher/wx_gui/gui_install_oc.py +++ b/opencore_legacy_patcher/wx_gui/gui_install_oc.py @@ -10,7 +10,7 @@ import traceback from .. import constants from ..datasets import os_data -from ..utilities import install +from ..support import install from ..wx_gui import ( gui_main_menu, diff --git a/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py b/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py index 1e159a90a..152b6a34c 100644 --- a/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py +++ b/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py @@ -23,7 +23,7 @@ from ..wx_gui import ( gui_download, gui_macos_installer_flash ) -from ..utilities import ( +from ..support import ( macos_installer_handler, utilities, network_handler, diff --git a/opencore_legacy_patcher/wx_gui/gui_macos_installer_flash.py b/opencore_legacy_patcher/wx_gui/gui_macos_installer_flash.py index 0a347d7ca..689ad7828 100644 --- a/opencore_legacy_patcher/wx_gui/gui_macos_installer_flash.py +++ b/opencore_legacy_patcher/wx_gui/gui_macos_installer_flash.py @@ -21,7 +21,7 @@ from ..wx_gui import ( gui_build, gui_support ) -from ..utilities import ( +from ..support import ( macos_installer_handler, utilities, network_handler, diff --git a/opencore_legacy_patcher/wx_gui/gui_main_menu.py b/opencore_legacy_patcher/wx_gui/gui_main_menu.py index 479f46879..5f609d5dc 100644 --- a/opencore_legacy_patcher/wx_gui/gui_main_menu.py +++ b/opencore_legacy_patcher/wx_gui/gui_main_menu.py @@ -17,7 +17,7 @@ from pathlib import Path from .. import constants -from ..utilities import ( +from ..support import ( global_settings, updates ) diff --git a/opencore_legacy_patcher/wx_gui/gui_settings.py b/opencore_legacy_patcher/wx_gui/gui_settings.py index 5b2b7ec6b..8b86a0ac8 100644 --- a/opencore_legacy_patcher/wx_gui/gui_settings.py +++ b/opencore_legacy_patcher/wx_gui/gui_settings.py @@ -20,7 +20,7 @@ from ..wx_gui import ( gui_support, gui_update ) -from ..utilities import ( +from ..support import ( global_settings, defaults, generate_smbios, diff --git a/opencore_legacy_patcher/wx_gui/gui_sys_patch_start.py b/opencore_legacy_patcher/wx_gui/gui_sys_patch_start.py index 5413f2816..5a28496ed 100644 --- a/opencore_legacy_patcher/wx_gui/gui_sys_patch_start.py +++ b/opencore_legacy_patcher/wx_gui/gui_sys_patch_start.py @@ -16,7 +16,7 @@ from pathlib import Path from .. import constants from ..datasets import os_data -from ..utilities import kdk_handler +from ..support import kdk_handler from ..sys_patch import ( sys_patch, diff --git a/opencore_legacy_patcher/wx_gui/gui_update.py b/opencore_legacy_patcher/wx_gui/gui_update.py index ba9ae5f7f..81db2eab5 100644 --- a/opencore_legacy_patcher/wx_gui/gui_update.py +++ b/opencore_legacy_patcher/wx_gui/gui_update.py @@ -18,7 +18,7 @@ from ..wx_gui import ( gui_download, gui_support ) -from ..utilities import ( +from ..support import ( network_handler, updates )