From a2dffe595e57fb2ddc0cdae89c702354f524b2b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:38:55 +0100 Subject: [PATCH] Bump pyupgrade from 3.1.0 to 3.2.0 (#3979) * Bump pyupgrade from 3.1.0 to 3.2.0 Bumps [pyupgrade](https://github.com/asottile/pyupgrade) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/asottile/pyupgrade/releases) - [Commits](https://github.com/asottile/pyupgrade/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: pyupgrade dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update .pre-commit-config.yaml * Fixing pyupgrade Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pascal Vizeli --- .pre-commit-config.yaml | 2 +- requirements_tests.txt | 2 +- supervisor/addons/addon.py | 3 ++- supervisor/addons/model.py | 3 ++- supervisor/api/addons.py | 3 ++- supervisor/api/audio.py | 3 ++- supervisor/api/dns.py | 3 ++- supervisor/api/homeassistant.py | 3 ++- supervisor/api/multicast.py | 3 ++- supervisor/api/network.py | 3 ++- supervisor/api/os.py | 3 ++- supervisor/api/resolution.py | 3 ++- supervisor/api/store.py | 3 ++- supervisor/api/supervisor.py | 3 ++- supervisor/backups/backup.py | 3 ++- supervisor/bus.py | 3 ++- supervisor/core.py | 2 +- supervisor/coresys.py | 3 ++- supervisor/docker/addon.py | 3 ++- supervisor/docker/homeassistant.py | 2 +- supervisor/docker/interface.py | 3 ++- supervisor/docker/supervisor.py | 2 +- supervisor/exceptions.py | 2 +- supervisor/homeassistant/core.py | 2 +- supervisor/host/services.py | 2 +- supervisor/jobs/decorator.py | 3 ++- supervisor/misc/scheduler.py | 2 +- supervisor/os/manager.py | 2 +- supervisor/plugins/base.py | 2 +- supervisor/plugins/cli.py | 2 +- supervisor/store/data.py | 3 ++- supervisor/supervisor.py | 2 +- supervisor/utils/dbus.py | 3 ++- 33 files changed, 53 insertions(+), 33 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bce42c248..ab3bcbe30 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: hooks: - id: isort - repo: https://github.com/asottile/pyupgrade - rev: v2.32.1 + rev: v3.2.0 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/requirements_tests.txt b/requirements_tests.txt index 46f11e4ec..09c1008e0 100644 --- a/requirements_tests.txt +++ b/requirements_tests.txt @@ -11,5 +11,5 @@ pytest-asyncio==0.18.3 pytest-cov==4.0.0 pytest-timeout==2.1.0 pytest==7.2.0 -pyupgrade==3.1.0 +pyupgrade==3.2.0 time-machine==2.8.2 diff --git a/supervisor/addons/addon.py b/supervisor/addons/addon.py index b88457725..ca95bca53 100644 --- a/supervisor/addons/addon.py +++ b/supervisor/addons/addon.py @@ -1,5 +1,6 @@ """Init file for Supervisor add-ons.""" import asyncio +from collections.abc import Awaitable from contextlib import suppress from copy import deepcopy from ipaddress import IPv4Address @@ -10,7 +11,7 @@ import secrets import shutil import tarfile from tempfile import TemporaryDirectory -from typing import Any, Awaitable, Final +from typing import Any, Final import aiohttp from deepmerge import Merger diff --git a/supervisor/addons/model.py b/supervisor/addons/model.py index 117d52f02..ca3d4f12d 100644 --- a/supervisor/addons/model.py +++ b/supervisor/addons/model.py @@ -1,7 +1,8 @@ """Init file for Supervisor add-ons.""" from abc import ABC, abstractmethod +from collections.abc import Awaitable from pathlib import Path -from typing import Any, Awaitable +from typing import Any from awesomeversion import AwesomeVersion, AwesomeVersionException diff --git a/supervisor/api/addons.py b/supervisor/api/addons.py index ed41343db..766616f27 100644 --- a/supervisor/api/addons.py +++ b/supervisor/api/addons.py @@ -1,7 +1,8 @@ """Init file for Supervisor Home Assistant RESTful API.""" import asyncio +from collections.abc import Awaitable import logging -from typing import Any, Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/api/audio.py b/supervisor/api/audio.py index fc6025a29..3db354cfd 100644 --- a/supervisor/api/audio.py +++ b/supervisor/api/audio.py @@ -1,7 +1,8 @@ """Init file for Supervisor Audio RESTful API.""" import asyncio +from collections.abc import Awaitable import logging -from typing import Any, Awaitable +from typing import Any from aiohttp import web import attr diff --git a/supervisor/api/dns.py b/supervisor/api/dns.py index 181920dad..cf0ca46ed 100644 --- a/supervisor/api/dns.py +++ b/supervisor/api/dns.py @@ -1,7 +1,8 @@ """Init file for Supervisor DNS RESTful API.""" import asyncio +from collections.abc import Awaitable import logging -from typing import Any, Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/api/homeassistant.py b/supervisor/api/homeassistant.py index 1dcd25e56..a9ea2b96e 100644 --- a/supervisor/api/homeassistant.py +++ b/supervisor/api/homeassistant.py @@ -1,7 +1,8 @@ """Init file for Supervisor Home Assistant RESTful API.""" import asyncio +from collections.abc import Awaitable import logging -from typing import Any, Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/api/multicast.py b/supervisor/api/multicast.py index 2f0036244..b715a3948 100644 --- a/supervisor/api/multicast.py +++ b/supervisor/api/multicast.py @@ -1,7 +1,8 @@ """Init file for Supervisor Multicast RESTful API.""" import asyncio +from collections.abc import Awaitable import logging -from typing import Any, Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/api/network.py b/supervisor/api/network.py index d86bb9fc1..ea7f11d94 100644 --- a/supervisor/api/network.py +++ b/supervisor/api/network.py @@ -1,7 +1,8 @@ """REST API for network.""" import asyncio +from collections.abc import Awaitable from ipaddress import ip_address, ip_interface -from typing import Any, Awaitable +from typing import Any from aiohttp import web import attr diff --git a/supervisor/api/os.py b/supervisor/api/os.py index 8aa6b99b4..456a527bb 100644 --- a/supervisor/api/os.py +++ b/supervisor/api/os.py @@ -1,8 +1,9 @@ """Init file for Supervisor HassOS RESTful API.""" import asyncio +from collections.abc import Awaitable import logging from pathlib import Path -from typing import Any, Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/api/resolution.py b/supervisor/api/resolution.py index d9b62f494..72efd6997 100644 --- a/supervisor/api/resolution.py +++ b/supervisor/api/resolution.py @@ -1,6 +1,7 @@ """Handle REST API for resoulution.""" import asyncio -from typing import Any, Awaitable +from collections.abc import Awaitable +from typing import Any from aiohttp import web import attr diff --git a/supervisor/api/store.py b/supervisor/api/store.py index 1263add40..d95fe5975 100644 --- a/supervisor/api/store.py +++ b/supervisor/api/store.py @@ -1,6 +1,7 @@ """Init file for Supervisor Home Assistant RESTful API.""" import asyncio -from typing import Any, Awaitable +from collections.abc import Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/api/supervisor.py b/supervisor/api/supervisor.py index fae9b59a4..64592b4bd 100644 --- a/supervisor/api/supervisor.py +++ b/supervisor/api/supervisor.py @@ -1,7 +1,8 @@ """Init file for Supervisor Supervisor RESTful API.""" import asyncio +from collections.abc import Awaitable import logging -from typing import Any, Awaitable +from typing import Any from aiohttp import web import voluptuous as vol diff --git a/supervisor/backups/backup.py b/supervisor/backups/backup.py index 3b0688da3..2d8560792 100644 --- a/supervisor/backups/backup.py +++ b/supervisor/backups/backup.py @@ -1,12 +1,13 @@ """Representation of a backup file.""" from base64 import b64decode, b64encode +from collections.abc import Awaitable from datetime import timedelta import json import logging from pathlib import Path import tarfile from tempfile import TemporaryDirectory -from typing import Any, Awaitable +from typing import Any from awesomeversion import AwesomeVersion, AwesomeVersionCompareException from cryptography.hazmat.backends import default_backend diff --git a/supervisor/bus.py b/supervisor/bus.py index 2a0b8c1a2..897738317 100644 --- a/supervisor/bus.py +++ b/supervisor/bus.py @@ -1,8 +1,9 @@ """Bus event system.""" from __future__ import annotations +from collections.abc import Awaitable, Callable import logging -from typing import Any, Awaitable, Callable +from typing import Any import attr diff --git a/supervisor/core.py b/supervisor/core.py index 1f57b5d96..8f56f6b2f 100644 --- a/supervisor/core.py +++ b/supervisor/core.py @@ -1,9 +1,9 @@ """Main file for Supervisor.""" import asyncio +from collections.abc import Awaitable from contextlib import suppress from datetime import timedelta import logging -from typing import Awaitable import async_timeout diff --git a/supervisor/coresys.py b/supervisor/coresys.py index 30ac4fdcb..4456825e2 100644 --- a/supervisor/coresys.py +++ b/supervisor/coresys.py @@ -2,11 +2,12 @@ from __future__ import annotations import asyncio +from collections.abc import Callable, Coroutine from datetime import datetime import logging import os from types import MappingProxyType -from typing import TYPE_CHECKING, Any, Callable, Coroutine, TypeVar +from typing import TYPE_CHECKING, Any, TypeVar import aiohttp import sentry_sdk diff --git a/supervisor/docker/addon.py b/supervisor/docker/addon.py index 172afde3b..7070ffe93 100644 --- a/supervisor/docker/addon.py +++ b/supervisor/docker/addon.py @@ -2,12 +2,13 @@ from __future__ import annotations import asyncio +from collections.abc import Awaitable from contextlib import suppress from ipaddress import IPv4Address, ip_address import logging import os from pathlib import Path -from typing import TYPE_CHECKING, Awaitable +from typing import TYPE_CHECKING from awesomeversion import AwesomeVersion import docker diff --git a/supervisor/docker/homeassistant.py b/supervisor/docker/homeassistant.py index 73049981e..17b050410 100644 --- a/supervisor/docker/homeassistant.py +++ b/supervisor/docker/homeassistant.py @@ -1,7 +1,7 @@ """Init file for Supervisor Docker object.""" +from collections.abc import Awaitable from ipaddress import IPv4Address import logging -from typing import Awaitable from awesomeversion import AwesomeVersion, AwesomeVersionCompareException import docker diff --git a/supervisor/docker/interface.py b/supervisor/docker/interface.py index 1849868b4..6d48b1583 100644 --- a/supervisor/docker/interface.py +++ b/supervisor/docker/interface.py @@ -2,11 +2,12 @@ from __future__ import annotations import asyncio +from collections.abc import Awaitable from contextlib import suppress import logging import re from time import time -from typing import Any, Awaitable +from typing import Any from awesomeversion import AwesomeVersion from awesomeversion.strategy import AwesomeVersionStrategy diff --git a/supervisor/docker/supervisor.py b/supervisor/docker/supervisor.py index 87e952244..98306b42f 100644 --- a/supervisor/docker/supervisor.py +++ b/supervisor/docker/supervisor.py @@ -1,8 +1,8 @@ """Init file for Supervisor Docker object.""" +from collections.abc import Awaitable from ipaddress import IPv4Address import logging import os -from typing import Awaitable from awesomeversion.awesomeversion import AwesomeVersion import docker diff --git a/supervisor/exceptions.py b/supervisor/exceptions.py index bf420d2e0..c015cc0fd 100644 --- a/supervisor/exceptions.py +++ b/supervisor/exceptions.py @@ -1,5 +1,5 @@ """Core Exceptions.""" -from typing import Callable +from collections.abc import Callable class HassioError(Exception): diff --git a/supervisor/homeassistant/core.py b/supervisor/homeassistant/core.py index 0174e6494..1eb7d3b8f 100644 --- a/supervisor/homeassistant/core.py +++ b/supervisor/homeassistant/core.py @@ -1,11 +1,11 @@ """Home Assistant control object.""" import asyncio +from collections.abc import Awaitable from contextlib import suppress import logging import re import secrets import shutil -from typing import Awaitable import attr from awesomeversion import AwesomeVersion diff --git a/supervisor/host/services.py b/supervisor/host/services.py index ed666e127..6dee30650 100644 --- a/supervisor/host/services.py +++ b/supervisor/host/services.py @@ -1,6 +1,6 @@ """Service control for host.""" +from collections.abc import Awaitable import logging -from typing import Awaitable import attr diff --git a/supervisor/jobs/decorator.py b/supervisor/jobs/decorator.py index d990d9e8b..ac7bf38ca 100644 --- a/supervisor/jobs/decorator.py +++ b/supervisor/jobs/decorator.py @@ -1,9 +1,10 @@ """Job decorator.""" import asyncio +from collections.abc import Callable from datetime import datetime, timedelta from functools import wraps import logging -from typing import Any, Callable +from typing import Any import sentry_sdk diff --git a/supervisor/misc/scheduler.py b/supervisor/misc/scheduler.py index 1fe2a841f..fa986d332 100644 --- a/supervisor/misc/scheduler.py +++ b/supervisor/misc/scheduler.py @@ -1,8 +1,8 @@ """Schedule for Supervisor.""" import asyncio +from collections.abc import Awaitable, Callable from datetime import date, datetime, time, timedelta import logging -from typing import Awaitable, Callable from uuid import UUID, uuid4 import async_timeout diff --git a/supervisor/os/manager.py b/supervisor/os/manager.py index 5f34e67f6..1a25896c1 100644 --- a/supervisor/os/manager.py +++ b/supervisor/os/manager.py @@ -1,8 +1,8 @@ """OS support on supervisor.""" import asyncio +from collections.abc import Awaitable import logging from pathlib import Path -from typing import Awaitable import aiohttp from awesomeversion import AwesomeVersion, AwesomeVersionException diff --git a/supervisor/plugins/base.py b/supervisor/plugins/base.py index aa1bd0e49..2b8d2ed49 100644 --- a/supervisor/plugins/base.py +++ b/supervisor/plugins/base.py @@ -1,9 +1,9 @@ """Supervisor plugins base class.""" from abc import ABC, abstractmethod import asyncio +from collections.abc import Awaitable from contextlib import suppress import logging -from typing import Awaitable from awesomeversion import AwesomeVersion, AwesomeVersionException diff --git a/supervisor/plugins/cli.py b/supervisor/plugins/cli.py index cc6f28f88..c9015e057 100644 --- a/supervisor/plugins/cli.py +++ b/supervisor/plugins/cli.py @@ -3,10 +3,10 @@ Code: https://github.com/home-assistant/plugin-cli """ import asyncio +from collections.abc import Awaitable from contextlib import suppress import logging import secrets -from typing import Awaitable from awesomeversion import AwesomeVersion diff --git a/supervisor/store/data.py b/supervisor/store/data.py index 2d58a16cc..bcd925074 100644 --- a/supervisor/store/data.py +++ b/supervisor/store/data.py @@ -1,7 +1,8 @@ """Init file for Supervisor add-on data.""" +from collections.abc import Awaitable import logging from pathlib import Path -from typing import Any, Awaitable +from typing import Any import voluptuous as vol from voluptuous.humanize import humanize_error diff --git a/supervisor/supervisor.py b/supervisor/supervisor.py index 28c3cc39b..9a863466f 100644 --- a/supervisor/supervisor.py +++ b/supervisor/supervisor.py @@ -1,12 +1,12 @@ """Home Assistant control object.""" import asyncio +from collections.abc import Awaitable from contextlib import suppress from datetime import timedelta from ipaddress import IPv4Address import logging from pathlib import Path from tempfile import TemporaryDirectory -from typing import Awaitable import aiohttp from aiohttp.client_exceptions import ClientError diff --git a/supervisor/utils/dbus.py b/supervisor/utils/dbus.py index 3cf46e57d..3738e1897 100644 --- a/supervisor/utils/dbus.py +++ b/supervisor/utils/dbus.py @@ -2,8 +2,9 @@ from __future__ import annotations import asyncio +from collections.abc import Awaitable, Callable, Coroutine import logging -from typing import Any, Awaitable, Callable, Coroutine +from typing import Any from dbus_fast import ( ErrorType,