From 8f74bff354374357f25f62469980441e71e01f8f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 27 Jan 2023 16:32:04 +0100 Subject: [PATCH] Enable Ruff PLC0414 (#86799) --- homeassistant/components/hue/v2/hue_event.py | 2 +- pyproject.toml | 1 + tests/components/freebox/test_init.py | 2 +- tests/components/goalzero/test_switch.py | 2 +- tests/components/heos/conftest.py | 2 +- tests/components/uvc/test_camera.py | 2 +- tests/components/zwave_me/test_remove_stale_devices.py | 2 +- tests/conftest.py | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/hue/v2/hue_event.py b/homeassistant/components/hue/v2/hue_event.py index 8e85288eee0..07a54e0f84f 100644 --- a/homeassistant/components/hue/v2/hue_event.py +++ b/homeassistant/components/hue/v2/hue_event.py @@ -12,7 +12,7 @@ from homeassistant.core import callback from homeassistant.helpers import device_registry from homeassistant.util import slugify -from ..const import ATTR_HUE_EVENT, CONF_SUBTYPE, DOMAIN as DOMAIN +from ..const import ATTR_HUE_EVENT, CONF_SUBTYPE, DOMAIN CONF_CONTROL_ID = "control_id" CONF_DURATION = "duration" diff --git a/pyproject.toml b/pyproject.toml index bdc04254ea9..7e9e8426204 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -250,6 +250,7 @@ select = [ "E", # pycodestyle "F", # pyflakes/autoflake "PGH004", # Use specific rule codes when using noqa + "PLC0414", # Useless import alias. Import alias does not rename original package. "SIM105", # Use contextlib.suppress({exception}) instead of try-except-pass "SIM117", # Merge with-statements that use the same scope "SIM401", # Use get from dict with default instead of an if block diff --git a/tests/components/freebox/test_init.py b/tests/components/freebox/test_init.py index 2f33832f518..9b08e940223 100644 --- a/tests/components/freebox/test_init.py +++ b/tests/components/freebox/test_init.py @@ -2,7 +2,7 @@ from unittest.mock import Mock, patch from homeassistant.components.device_tracker import DOMAIN as DT_DOMAIN -from homeassistant.components.freebox.const import DOMAIN as DOMAIN, SERVICE_REBOOT +from homeassistant.components.freebox.const import DOMAIN, SERVICE_REBOOT from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN from homeassistant.config_entries import ConfigEntryState diff --git a/tests/components/goalzero/test_switch.py b/tests/components/goalzero/test_switch.py index 0dd601fe70a..ffe30711abc 100644 --- a/tests/components/goalzero/test_switch.py +++ b/tests/components/goalzero/test_switch.py @@ -1,6 +1,6 @@ """Switch tests for the Goalzero integration.""" from homeassistant.components.goalzero.const import DEFAULT_NAME -from homeassistant.components.switch import DOMAIN as DOMAIN +from homeassistant.components.switch import DOMAIN from homeassistant.const import ( ATTR_ENTITY_ID, SERVICE_TURN_OFF, diff --git a/tests/components/heos/conftest.py b/tests/components/heos/conftest.py index d303df2619f..ee3847604c9 100644 --- a/tests/components/heos/conftest.py +++ b/tests/components/heos/conftest.py @@ -2,7 +2,7 @@ from __future__ import annotations from collections.abc import Sequence -from unittest.mock import Mock, patch as patch +from unittest.mock import Mock, patch from pyheos import ( Dispatcher, diff --git a/tests/components/uvc/test_camera.py b/tests/components/uvc/test_camera.py index 030a56c6389..0cabc8d1a76 100644 --- a/tests/components/uvc/test_camera.py +++ b/tests/components/uvc/test_camera.py @@ -4,7 +4,7 @@ from unittest.mock import call, patch import pytest import requests -from uvcclient import camera as camera, nvr +from uvcclient import camera, nvr from homeassistant.components.camera import ( DEFAULT_CONTENT_TYPE, diff --git a/tests/components/zwave_me/test_remove_stale_devices.py b/tests/components/zwave_me/test_remove_stale_devices.py index 484c38b9f33..af35f16c310 100644 --- a/tests/components/zwave_me/test_remove_stale_devices.py +++ b/tests/components/zwave_me/test_remove_stale_devices.py @@ -2,7 +2,7 @@ from unittest.mock import patch import uuid -import pytest as pytest +import pytest from zwave_me_ws import ZWaveMeData from homeassistant.components.zwave_me import ZWaveMePlatform diff --git a/tests/conftest.py b/tests/conftest.py index b7544793f50..6aa4d639d99 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -68,7 +68,7 @@ from .common import ( # noqa: E402, isort:skip async_test_home_assistant, get_test_home_assistant, init_recorder_component, - mock_storage as mock_storage, + mock_storage, ) from .test_util.aiohttp import mock_aiohttp_client # noqa: E402, isort:skip