Move utilities directory to support

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,

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
 
 

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 . import ioreg
-from ..detections import ioreg
+
+from ..support import utilities
 
 from ..datasets import (
     pci_data,

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,

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 (

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 (

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 (

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
 
 

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
 
 

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
 )

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 (

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
 )

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

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

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,

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:

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
 )

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
 )

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
 )

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

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"

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 (

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:

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,

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

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
 
 

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

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
 
 

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
 )

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,

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,

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,

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
 )

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,

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,

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
 )