Skip to content

Commit cb3424c

Browse files
authored
Remove more components from _IGNORE_ROOT_IMPORT in pylint plugin (home-assistant#154622)
1 parent a799f7f commit cb3424c

File tree

12 files changed

+21
-22
lines changed

12 files changed

+21
-22
lines changed

homeassistant/components/camera/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@
7474
StreamType,
7575
)
7676
from .helper import get_camera_from_entity_id
77-
from .img_util import scale_jpeg_camera_image
77+
from .img_util import (
78+
TurboJPEGSingleton, # noqa: F401
79+
scale_jpeg_camera_image,
80+
)
7881
from .prefs import (
7982
CameraPreferences,
8083
DynamicStreamSettings, # noqa: F401

homeassistant/components/cloud/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
errors as alexa_errors,
2020
smart_home as alexa_smart_home,
2121
)
22-
from homeassistant.components.camera.webrtc import async_register_ice_servers
22+
from homeassistant.components.camera import async_register_ice_servers
2323
from homeassistant.components.google_assistant import smart_home as ga
2424
from homeassistant.const import __version__ as HA_VERSION
2525
from homeassistant.core import Context, HassJob, HomeAssistant, callback

homeassistant/components/demo/alarm_control_panel.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import datetime
66

77
from homeassistant.components.alarm_control_panel import AlarmControlPanelState
8-
from homeassistant.components.manual.alarm_control_panel import ManualAlarm
8+
from homeassistant.components.manual.alarm_control_panel import ( # pylint: disable=hass-component-root-import
9+
ManualAlarm,
10+
)
911
from homeassistant.config_entries import ConfigEntry
1012
from homeassistant.const import CONF_ARMING_TIME, CONF_DELAY_TIME, CONF_TRIGGER_TIME
1113
from homeassistant.core import HomeAssistant

homeassistant/components/go2rtc/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
WebRTCMessage,
3131
WebRTCSendMessage,
3232
async_register_webrtc_provider,
33+
get_dynamic_camera_stream_settings,
3334
)
34-
from homeassistant.components.camera.prefs import get_dynamic_camera_stream_settings
3535
from homeassistant.components.default_config import DOMAIN as DEFAULT_CONFIG_DOMAIN
3636
from homeassistant.components.stream import Orientation
3737
from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry

homeassistant/components/lovelace/cast.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from pychromecast.const import CAST_TYPE_CHROMECAST
99

1010
from homeassistant.components.cast import DOMAIN as CAST_DOMAIN
11-
from homeassistant.components.cast.home_assistant_cast import (
11+
from homeassistant.components.cast.home_assistant_cast import ( # pylint: disable=hass-component-root-import
1212
ATTR_URL_PATH,
1313
ATTR_VIEW_PATH,
1414
NO_URL_AVAILABLE_ERROR,

homeassistant/components/sonos/media_player.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
async_process_play_media_url,
4040
)
4141
from homeassistant.components.plex import PLEX_URI_SCHEME
42-
from homeassistant.components.plex.services import process_plex_payload
42+
from homeassistant.components.plex.services import ( # pylint: disable=hass-component-root-import
43+
process_plex_payload,
44+
)
4345
from homeassistant.core import HomeAssistant, callback
4446
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
4547
from homeassistant.helpers import entity_registry as er

homeassistant/components/stream/core.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,7 @@ def __init__(
441441

442442
# Keep import here so that we can import stream integration
443443
# without installing reqs
444-
from homeassistant.components.camera.img_util import ( # noqa: PLC0415
445-
TurboJPEGSingleton,
446-
)
444+
from homeassistant.components.camera import TurboJPEGSingleton # noqa: PLC0415
447445

448446
self._packet: Packet | None = None
449447
self._event: asyncio.Event = asyncio.Event()

pylint/plugins/hass_imports.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ class ObsoleteImportMatch:
128128
_IGNORE_ROOT_IMPORT = (
129129
"automation",
130130
"bluetooth",
131-
"camera",
132-
"cast",
133131
"device_automation",
134132
"device_tracker",
135133
"ffmpeg",
@@ -138,8 +136,6 @@ class ObsoleteImportMatch:
138136
"homeassistant",
139137
"homeassistant_hardware",
140138
"http",
141-
"manual",
142-
"plex",
143139
"recorder",
144140
"rest",
145141
"script",

tests/components/go2rtc/test_init.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
from webrtc_models import RTCIceCandidateInit
2222

2323
from homeassistant.components.camera import (
24+
DATA_CAMERA_PREFS,
25+
CameraPreferences,
26+
DynamicStreamSettings,
2427
StreamType,
2528
WebRTCAnswer as HAWebRTCAnswer,
2629
WebRTCCandidate as HAWebRTCCandidate,
@@ -29,11 +32,6 @@
2932
WebRTCSendMessage,
3033
async_get_image,
3134
)
32-
from homeassistant.components.camera.const import DATA_CAMERA_PREFS
33-
from homeassistant.components.camera.prefs import (
34-
CameraPreferences,
35-
DynamicStreamSettings,
36-
)
3735
from homeassistant.components.default_config import DOMAIN as DEFAULT_CONFIG_DOMAIN
3836
from homeassistant.components.go2rtc import HomeAssistant, WebRTCProvider
3937
from homeassistant.components.go2rtc.const import (

tests/components/homekit/test_type_cameras.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from homeassistant.components import camera, ffmpeg
1111
from homeassistant.components.binary_sensor import BinarySensorDeviceClass
12-
from homeassistant.components.camera.img_util import TurboJPEGSingleton
12+
from homeassistant.components.camera import TurboJPEGSingleton
1313
from homeassistant.components.event import EventDeviceClass
1414
from homeassistant.components.homekit.accessories import HomeBridge
1515
from homeassistant.components.homekit.const import (

0 commit comments

Comments
 (0)