Absolute imports to relative imports (#3787)

supervisor/addons/model.py

@@ -5,8 +5,6 @@ from typing import Any, Awaitable, Optional
 
 from awesomeversion import AwesomeVersion, AwesomeVersionException
 
-from supervisor.addons.const import AddonBackupMode
-
 from ..const import (
     ATTR_ADVANCED,
     ATTR_APPARMOR,
@@ -79,7 +77,7 @@ from ..const import (
 )
 from ..coresys import CoreSys, CoreSysAttributes
 from ..docker.const import Capabilities
-from .const import ATTR_BACKUP, ATTR_CODENOTARY
+from .const import ATTR_BACKUP, ATTR_CODENOTARY, AddonBackupMode
 from .options import AddonOptions, UiOptions
 from .validate import RE_SERVICE, RE_VOLUME
 

supervisor/addons/validate.py

@@ -7,8 +7,6 @@ import uuid
 
 import voluptuous as vol
 
-from supervisor.addons.const import AddonBackupMode
-
 from ..const import (
     ARCH_ALL,
     ATTR_ACCESS_TOKEN,
@@ -110,7 +108,7 @@ from ..validate import (
     uuid_match,
     version_tag,
 )
-from .const import ATTR_BACKUP, ATTR_CODENOTARY
+from .const import ATTR_BACKUP, ATTR_CODENOTARY, AddonBackupMode
 from .options import RE_SCHEMA_ELEMENT
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/api/__init__.py

@@ -5,11 +5,9 @@ from typing import Any, Optional
 
 from aiohttp import web
 
-from supervisor.api.utils import api_process
-from supervisor.const import AddonState
-from supervisor.exceptions import APIAddonNotInstalled
-
+from ..const import AddonState
 from ..coresys import CoreSys, CoreSysAttributes
+from ..exceptions import APIAddonNotInstalled
 from .addons import APIAddons
 from .audio import APIAudio
 from .auth import APIAuth
@@ -35,6 +33,7 @@ from .security import APISecurity
 from .services import APIServices
 from .store import APIStore
 from .supervisor import APISupervisor
+from .utils import api_process
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 

supervisor/bootstrap.py

@@ -13,9 +13,6 @@ from sentry_sdk.integrations.excepthook import ExcepthookIntegration
 from sentry_sdk.integrations.logging import LoggingIntegration
 from sentry_sdk.integrations.threading import ThreadingIntegration
 
-from supervisor.docker.manager import DockerAPI
-from supervisor.jobs import JobManager
-
 from .addons import AddonManager
 from .api import RestAPI
 from .arch import CpuArch
@@ -39,10 +36,12 @@ from .core import Core
 from .coresys import CoreSys
 from .dbus.manager import DBusManager
 from .discovery import Discovery
+from .docker.manager import DockerAPI
 from .hardware.manager import HardwareManager
 from .homeassistant.module import HomeAssistant
 from .host.manager import HostManager
 from .ingress import Ingress
+from .jobs import JobManager
 from .misc.filter import filter_data
 from .misc.scheduler import Scheduler
 from .misc.tasks import Tasks

supervisor/dbus/network/__init__.py

@@ -6,9 +6,6 @@ from typing import Any, Awaitable
 from awesomeversion import AwesomeVersion, AwesomeVersionException
 import sentry_sdk
 
-from supervisor.dbus.network.connection import NetworkConnection
-from supervisor.dbus.network.setting import NetworkSetting
-
 from ...exceptions import (
     DBusError,
     DBusFatalError,
@@ -30,8 +27,10 @@ from ..const import (
 )
 from ..interface import DBusInterface
 from ..utils import dbus_connected
+from .connection import NetworkConnection
 from .dns import NetworkManagerDNS
 from .interface import NetworkInterface
+from .setting import NetworkSetting
 from .settings import NetworkManagerSettings
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/dbus/network/connection.py

@@ -2,8 +2,6 @@
 from ipaddress import ip_address, ip_interface
 from typing import Optional
 
-from supervisor.dbus.utils import dbus_connected
-
 from ...const import ATTR_ADDRESS, ATTR_PREFIX
 from ...utils.dbus import DBus
 from ..const import (
@@ -26,6 +24,7 @@ from ..const import (
     ConnectionStateType,
 )
 from ..interface import DBusInterfaceProxy
+from ..utils import dbus_connected
 from .configuration import IpConfiguration
 
 

supervisor/discovery/services/adguard.py

@@ -1,8 +1,7 @@
 """Discovery service for AdGuard."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PORT
 
 SCHEMA = vol.Schema(

supervisor/discovery/services/almond.py

@@ -1,8 +1,7 @@
 """Discovery service for Almond."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PORT
 
 SCHEMA = vol.Schema(

supervisor/discovery/services/deconz.py

@@ -1,8 +1,7 @@
 """Discovery service for MQTT."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_API_KEY, ATTR_HOST, ATTR_PORT, ATTR_SERIAL
 
 SCHEMA = vol.Schema(

supervisor/discovery/services/homematic.py

@@ -1,8 +1,7 @@
 """Discovery service for HomeMatic."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PORT
 
 SCHEMA = vol.Schema(

supervisor/discovery/services/mqtt.py

@@ -1,8 +1,7 @@
 """Discovery service for MQTT."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import (
     ATTR_HOST,
     ATTR_PASSWORD,

supervisor/discovery/services/ozw.py

@@ -1,8 +1,7 @@
 """Discovery service for OpenZwave MQTT."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PASSWORD, ATTR_PORT, ATTR_USERNAME
 
 # pylint: disable=no-value-for-parameter

supervisor/discovery/services/rtsp_to_webrtc.py

@@ -1,8 +1,7 @@
 """Discovery service for RTSPtoWebRTC."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PORT
 
 SCHEMA = vol.Schema(

supervisor/discovery/services/unifi.py

@@ -1,8 +1,7 @@
 """Discovery service for UniFi."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PORT
 
 SCHEMA = vol.Schema(

supervisor/discovery/services/vlc_telnet.py

@@ -1,8 +1,7 @@
 """Discovery service for VLC Telnet."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PASSWORD, ATTR_PORT
 
 # pylint: disable=no-value-for-parameter

supervisor/discovery/services/zwave_js.py

@@ -1,8 +1,7 @@
 """Discovery service for Zwave JS."""
 import voluptuous as vol
 
-from supervisor.validate import network_port
-
+from ...validate import network_port
 from ..const import ATTR_HOST, ATTR_PORT
 
 # pylint: disable=no-value-for-parameter

supervisor/docker/interface.py

@@ -14,8 +14,6 @@ import docker
 from docker.models.containers import Container
 import requests
 
-from supervisor.docker.monitor import DockerContainerStateEvent
-
 from ..const import (
     ATTR_PASSWORD,
     ATTR_REGISTRY,
@@ -39,6 +37,7 @@ from ..resolution.const import ContextType, IssueType, SuggestionType
 from ..utils import process_lock
 from .const import ContainerState
 from .manager import CommandReturn
+from .monitor import DockerContainerStateEvent
 from .stats import DockerStats
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/docker/manager.py

@@ -17,9 +17,6 @@ from docker.models.networks import Network
 from docker.types.daemon import CancellableStream
 import requests
 
-from supervisor.coresys import CoreSys
-from supervisor.docker.monitor import DockerMonitor
-
 from ..const import (
     ATTR_REGISTRIES,
     DNS_SUFFIX,
@@ -28,10 +25,12 @@ from ..const import (
     FILE_HASSIO_DOCKER,
     SOCKET_DOCKER,
 )
+from ..coresys import CoreSys
 from ..exceptions import DockerAPIError, DockerError, DockerNotFound, DockerRequestError
 from ..utils.common import FileConfiguration
 from ..validate import SCHEMA_DOCKER_CONFIG
 from .const import LABEL_MANAGED
+from .monitor import DockerMonitor
 from .network import DockerNetwork
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/docker/monitor.py

@@ -7,9 +7,8 @@ from typing import Optional
 from docker.models.containers import Container
 from docker.types.daemon import CancellableStream
 
-from supervisor.const import BusEvent
-from supervisor.coresys import CoreSys, CoreSysAttributes
-
+from ..const import BusEvent
+from ..coresys import CoreSys, CoreSysAttributes
 from .const import LABEL_MANAGED, ContainerState
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/hardware/disk.py

@@ -4,9 +4,8 @@ from pathlib import Path
 import shutil
 from typing import Union
 
-from supervisor.exceptions import HardwareNotFound
-
 from ..coresys import CoreSys, CoreSysAttributes
+from ..exceptions import HardwareNotFound
 from .const import UdevSubsystem
 from .data import Device
 

supervisor/hardware/manager.py

@@ -5,10 +5,9 @@ from typing import Optional
 
 import pyudev
 
-from supervisor.hardware.const import UdevSubsystem
-
 from ..coresys import CoreSys, CoreSysAttributes
 from ..exceptions import HardwareNotFound
+from .const import UdevSubsystem
 from .data import Device
 from .disk import HwDisk
 from .helper import HwHelper

supervisor/homeassistant/core.py

@@ -10,13 +10,11 @@ from typing import Awaitable, Optional
 import attr
 from awesomeversion import AwesomeVersion
 
-from supervisor.const import ATTR_HOMEASSISTANT, BusEvent
-from supervisor.docker.const import ContainerState
-from supervisor.docker.monitor import DockerContainerStateEvent
-from supervisor.jobs.const import JobExecutionLimit
-
+from ..const import ATTR_HOMEASSISTANT, BusEvent
 from ..coresys import CoreSys, CoreSysAttributes
+from ..docker.const import ContainerState
 from ..docker.homeassistant import DockerHomeAssistant
+from ..docker.monitor import DockerContainerStateEvent
 from ..docker.stats import DockerStats
 from ..exceptions import (
     DockerError,
@@ -25,6 +23,7 @@ from ..exceptions import (
     HomeAssistantJobError,
     HomeAssistantUpdateError,
 )
+from ..jobs.const import JobExecutionLimit
 from ..jobs.decorator import Job, JobCondition
 from ..resolution.const import ContextType, IssueType
 from ..utils import convert_to_ascii, process_lock

supervisor/host/info.py

@@ -4,9 +4,8 @@ from datetime import datetime
 import logging
 from typing import Optional
 
-from supervisor.dbus.const import MulticastProtocolEnabled
-
 from ..coresys import CoreSysAttributes
+from ..dbus.const import MulticastProtocolEnabled
 from ..exceptions import DBusError, HostError
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/host/network.py

@@ -8,9 +8,6 @@ import logging
 
 import attr
 
-from supervisor.jobs.const import JobCondition
-from supervisor.jobs.decorator import Job
-
 from ..const import ATTR_HOST_INTERNET
 from ..coresys import CoreSys, CoreSysAttributes
 from ..dbus.const import (
@@ -32,6 +29,8 @@ from ..exceptions import (
     HostNetworkNotFound,
     HostNotSupportedError,
 )
+from ..jobs.const import JobCondition
+from ..jobs.decorator import Job
 from .const import AuthMethod, InterfaceMethod, InterfaceType, WifiMode
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/plugins/audio.py

@@ -12,13 +12,10 @@ from typing import Optional
 from awesomeversion import AwesomeVersion
 import jinja2
 
-from supervisor.docker.const import ContainerState
-from supervisor.jobs.const import JobExecutionLimit
-from supervisor.jobs.decorator import Job
-
 from ..const import LogLevel
 from ..coresys import CoreSys
 from ..docker.audio import DockerAudio
+from ..docker.const import ContainerState
 from ..docker.stats import DockerStats
 from ..exceptions import (
     AudioError,
@@ -27,6 +24,8 @@ from ..exceptions import (
     ConfigurationFileError,
     DockerError,
 )
+from ..jobs.const import JobExecutionLimit
+from ..jobs.decorator import Job
 from ..utils.json import write_json_file
 from .base import PluginBase
 from .const import (

supervisor/plugins/base.py

@@ -7,12 +7,11 @@ from typing import Awaitable, Optional
 
 from awesomeversion import AwesomeVersion, AwesomeVersionException
 
-from supervisor.docker.const import ContainerState
-from supervisor.docker.monitor import DockerContainerStateEvent
-
 from ..const import ATTR_IMAGE, ATTR_VERSION, BusEvent
 from ..coresys import CoreSysAttributes
+from ..docker.const import ContainerState
 from ..docker.interface import DockerInterface
+from ..docker.monitor import DockerContainerStateEvent
 from ..exceptions import DockerError, PluginError
 from ..utils.common import FileConfiguration
 from .const import WATCHDOG_MAX_ATTEMPTS, WATCHDOG_RETRY_SECONDS

supervisor/plugins/dns.py

@@ -14,15 +14,12 @@ from awesomeversion import AwesomeVersion
 import jinja2
 import voluptuous as vol
 
-from supervisor.dbus.const import MulticastProtocolEnabled
-from supervisor.docker.const import ContainerState
-from supervisor.docker.monitor import DockerContainerStateEvent
-from supervisor.jobs.const import JobExecutionLimit
-from supervisor.jobs.decorator import Job
-
 from ..const import ATTR_SERVERS, DNS_SUFFIX, LogLevel
 from ..coresys import CoreSys
+from ..dbus.const import MulticastProtocolEnabled
+from ..docker.const import ContainerState
 from ..docker.dns import DockerDNS
+from ..docker.monitor import DockerContainerStateEvent
 from ..docker.stats import DockerStats
 from ..exceptions import (
     ConfigurationFileError,
@@ -31,6 +28,8 @@ from ..exceptions import (
     CoreDNSUpdateError,
     DockerError,
 )
+from ..jobs.const import JobExecutionLimit
+from ..jobs.decorator import Job
 from ..resolution.const import ContextType, IssueType, SuggestionType
 from ..utils.json import write_json_file
 from ..validate import dns_url

supervisor/plugins/multicast.py

@@ -9,11 +9,8 @@ from typing import Optional
 
 from awesomeversion import AwesomeVersion
 
-from supervisor.docker.const import ContainerState
-from supervisor.jobs.const import JobExecutionLimit
-from supervisor.jobs.decorator import Job
-
 from ..coresys import CoreSys
+from ..docker.const import ContainerState
 from ..docker.multicast import DockerMulticast
 from ..docker.stats import DockerStats
 from ..exceptions import (
@@ -22,6 +19,8 @@ from ..exceptions import (
     MulticastJobError,
     MulticastUpdateError,
 )
+from ..jobs.const import JobExecutionLimit
+from ..jobs.decorator import Job
 from .base import PluginBase
 from .const import (
     FILE_HASSIO_MULTICAST,

supervisor/plugins/validate.py

@@ -2,10 +2,9 @@
 
 import voluptuous as vol
 
-from supervisor.plugins.const import ATTR_FALLBACK
-
 from ..const import ATTR_ACCESS_TOKEN, ATTR_IMAGE, ATTR_SERVERS, ATTR_VERSION
 from ..validate import dns_server_list, docker_image, token, version_tag
+from .const import ATTR_FALLBACK
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_DNS_CONFIG = vol.Schema(

supervisor/resolution/checks/dns_server_failure.py

@@ -6,11 +6,10 @@ from typing import Optional
 from aiodns import DNSResolver
 from aiodns.error import DNSError
 
-from supervisor.jobs.const import JobCondition, JobExecutionLimit
-from supervisor.jobs.decorator import Job
-
 from ...const import CoreState
 from ...coresys import CoreSys
+from ...jobs.const import JobCondition, JobExecutionLimit
+from ...jobs.decorator import Job
 from ..const import DNS_CHECK_HOST, ContextType, IssueType
 from .base import CheckBase
 

supervisor/resolution/checks/dns_server_ipv6_error.py

@@ -6,11 +6,10 @@ from typing import Optional
 from aiodns import DNSResolver
 from aiodns.error import DNSError
 
-from supervisor.jobs.const import JobCondition, JobExecutionLimit
-from supervisor.jobs.decorator import Job
-
 from ...const import CoreState
 from ...coresys import CoreSys
+from ...jobs.const import JobCondition, JobExecutionLimit
+from ...jobs.decorator import Job
 from ..const import DNS_CHECK_HOST, DNS_ERROR_NO_DATA, ContextType, IssueType
 from .base import CheckBase
 

supervisor/services/modules/mqtt.py

@@ -4,10 +4,9 @@ from typing import Any
 
 import voluptuous as vol
 
-from supervisor.addons.addon import Addon
-from supervisor.exceptions import ServicesError
-from supervisor.validate import network_port
-
+from ...addons.addon import Addon
+from ...exceptions import ServicesError
+from ...validate import network_port
 from ..const import (
     ATTR_ADDON,
     ATTR_HOST,

supervisor/services/modules/mysql.py

@@ -4,10 +4,9 @@ from typing import Any
 
 import voluptuous as vol
 
-from supervisor.addons.addon import Addon
-from supervisor.exceptions import ServicesError
-from supervisor.validate import network_port
-
+from ...addons.addon import Addon
+from ...exceptions import ServicesError
+from ...validate import network_port
 from ..const import (
     ATTR_ADDON,
     ATTR_HOST,

supervisor/store/__init__.py

@@ -2,9 +2,6 @@
 import asyncio
 import logging
 
-from supervisor.store.validate import SCHEMA_STORE_FILE
-from supervisor.utils.common import FileConfiguration
-
 from ..const import ATTR_REPOSITORIES, URL_HASSIO_ADDONS
 from ..coresys import CoreSys, CoreSysAttributes
 from ..exceptions import (
@@ -17,11 +14,16 @@ from ..exceptions import (
 )
 from ..jobs.decorator import Job, JobCondition
 from ..resolution.const import ContextType, IssueType, SuggestionType
+from ..utils.common import FileConfiguration
 from .addon import AddonStore
 from .const import FILE_HASSIO_STORE, StoreType
 from .data import StoreData
 from .repository import Repository
-from .validate import BUILTIN_REPOSITORIES, ensure_builtin_repositories
+from .validate import (
+    BUILTIN_REPOSITORIES,
+    SCHEMA_STORE_FILE,
+    ensure_builtin_repositories,
+)
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 

supervisor/store/const.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from pathlib import Path
 
-from supervisor.const import SUPERVISOR_DATA
+from ..const import SUPERVISOR_DATA
 
 FILE_HASSIO_STORE = Path(SUPERVISOR_DATA, "store.json")
 

supervisor/store/validate.py

@@ -2,10 +2,9 @@
 
 import voluptuous as vol
 
-from supervisor.store.const import StoreType
-
 from ..const import ATTR_MAINTAINER, ATTR_NAME, ATTR_REPOSITORIES, ATTR_URL
 from ..validate import RE_REPOSITORY
+from .const import StoreType
 
 URL_COMMUNITY_ADDONS = "https://github.com/hassio-addons/repository"
 URL_ESPHOME = "https://github.com/esphome/home-assistant-addon"