From fd14add67beb8f3b62c6cc999fc1f34ffb64eff7 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Thu, 28 Nov 2024 11:20:44 +0100
Subject: [PATCH] Remove deprecated device registry constants (#131802)
---
homeassistant/helpers/device_registry.py | 26 +-----------------------
tests/helpers/test_device_registry.py | 22 +-------------------
2 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 5dfd5d9e8a9..981430f192d 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -6,7 +6,7 @@ from collections import defaultdict
from collections.abc import Mapping
from datetime import datetime
from enum import StrEnum
-from functools import lru_cache, partial
+from functools import lru_cache
import logging
import time
from typing import TYPE_CHECKING, Any, Literal, TypedDict
@@ -32,12 +32,6 @@ import homeassistant.util.uuid as uuid_util
from . import storage, translation
from .debounce import Debouncer
-from .deprecation import (
- DeprecatedConstantEnum,
- all_with_deprecated_constants,
- check_if_deprecated_constant,
- dir_with_deprecated_constants,
-)
from .frame import ReportBehavior, report_usage
from .json import JSON_DUMP, find_paths_unserializable_data, json_bytes, json_fragment
from .registry import BaseRegistry, BaseRegistryItems, RegistryIndexType
@@ -86,16 +80,6 @@ class DeviceEntryDisabler(StrEnum):
USER = "user"
-# DISABLED_* are deprecated, to be removed in 2022.3
-_DEPRECATED_DISABLED_CONFIG_ENTRY = DeprecatedConstantEnum(
- DeviceEntryDisabler.CONFIG_ENTRY, "2025.1"
-)
-_DEPRECATED_DISABLED_INTEGRATION = DeprecatedConstantEnum(
- DeviceEntryDisabler.INTEGRATION, "2025.1"
-)
-_DEPRECATED_DISABLED_USER = DeprecatedConstantEnum(DeviceEntryDisabler.USER, "2025.1")
-
-
class DeviceInfo(TypedDict, total=False):
"""Entity device information for device registry."""
@@ -1480,11 +1464,3 @@ def _normalize_connections(connections: set[tuple[str, str]]) -> set[tuple[str,
(key, format_mac(value)) if key == CONNECTION_NETWORK_MAC else (key, value)
for key, value in connections
}
-
-
-# These can be removed if no deprecated constant are in this module anymore
-__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
-__dir__ = partial(
- dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
-)
-__all__ = all_with_deprecated_constants(globals())
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index 2335b1b93bd..cf7bbe7d1e2 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -23,13 +23,7 @@ from homeassistant.helpers import (
)
from homeassistant.util.dt import utcnow
-from tests.common import (
- MockConfigEntry,
- async_capture_events,
- flush_store,
- help_test_all,
- import_and_test_deprecated_constant_enum,
-)
+from tests.common import MockConfigEntry, async_capture_events, flush_store
@pytest.fixture
@@ -2904,20 +2898,6 @@ async def test_loading_invalid_configuration_url_from_storage(
assert entry.configuration_url == "invalid"
-def test_all() -> None:
- """Test module.__all__ is correctly set."""
- help_test_all(dr)
-
-
-@pytest.mark.parametrize(("enum"), list(dr.DeviceEntryDisabler))
-def test_deprecated_constants(
- caplog: pytest.LogCaptureFixture,
- enum: dr.DeviceEntryDisabler,
-) -> None:
- """Test deprecated constants."""
- import_and_test_deprecated_constant_enum(caplog, dr, enum, "DISABLED_", "2025.1")
-
-
async def test_removing_labels(
hass: HomeAssistant, device_registry: dr.DeviceRegistry
) -> None:
--
GitLab