From c51b085d7860d4b136ae460778af14f4d60dad8a Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:09:23 +0000 Subject: [PATCH 1/5] Add light constants to deprecated imports plugin --- pylint/plugins/hass_imports.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index 9290654e2456c..22b359918ce2c 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -25,6 +25,16 @@ class ObsoleteImportMatch: constant=re.compile(r"^STATE_CLASS_(\w*)$"), ), ], + "homeassistant.components.light": [ + ObsoleteImportMatch( + reason="replaced by ColorMode enum", + constant=re.compile(r"^COLOR_MODE_(\w*)$"), + ), + ObsoleteImportMatch( + reason="replaced by LightEntityFeature enum", + constant=re.compile(r"^SUPPORT_(\w*)$"), + ), + ], } From 2aca53a315f65d3dc25ff1497921f8c7a4071cbd Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:10:40 +0000 Subject: [PATCH 2/5] Split SUPPORT_ --- pylint/plugins/hass_imports.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index 22b359918ce2c..125a4d957b35d 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -32,7 +32,11 @@ class ObsoleteImportMatch: ), ObsoleteImportMatch( reason="replaced by LightEntityFeature enum", - constant=re.compile(r"^SUPPORT_(\w*)$"), + constant=re.compile(r"^SUPPORT_(EFFECT|FLASH|TRANSITION)$"), + ), + ObsoleteImportMatch( + reason="replaced by color modes", + constant=re.compile(r"^SUPPORT_(BRIGHTNESS|COLOR_TEMP|COLOR|WHITE_VALUE)$"), ), ], } From b99a717de0623402f3f0dbe44a6540ded7ee83cf Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 4 Apr 2022 06:34:38 +0000 Subject: [PATCH 3/5] Add media_player --- pylint/plugins/hass_imports.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index 125a4d957b35d..026cf212c69f5 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -39,6 +39,18 @@ class ObsoleteImportMatch: constant=re.compile(r"^SUPPORT_(BRIGHTNESS|COLOR_TEMP|COLOR|WHITE_VALUE)$"), ), ], + "homeassistant.components.media_player": [ + ObsoleteImportMatch( + reason="replaced by MediaPlayerEntityFeature enum", + constant=re.compile(r"^SUPPORT_(\w*)$"), + ), + ], + "homeassistant.components.media_player.const": [ + ObsoleteImportMatch( + reason="replaced by MediaPlayerEntityFeature enum", + constant=re.compile(r"^SUPPORT_(\w*)$"), + ), + ], } From bb9cf071602e27d93506b9b7c3a1a72487df6fa8 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:11:41 +0000 Subject: [PATCH 4/5] Revert "Add media_player" This reverts commit b99a717de0623402f3f0dbe44a6540ded7ee83cf. --- pylint/plugins/hass_imports.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index 026cf212c69f5..125a4d957b35d 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -39,18 +39,6 @@ class ObsoleteImportMatch: constant=re.compile(r"^SUPPORT_(BRIGHTNESS|COLOR_TEMP|COLOR|WHITE_VALUE)$"), ), ], - "homeassistant.components.media_player": [ - ObsoleteImportMatch( - reason="replaced by MediaPlayerEntityFeature enum", - constant=re.compile(r"^SUPPORT_(\w*)$"), - ), - ], - "homeassistant.components.media_player.const": [ - ObsoleteImportMatch( - reason="replaced by MediaPlayerEntityFeature enum", - constant=re.compile(r"^SUPPORT_(\w*)$"), - ), - ], } From 654cb9c6b850014c7c9705d8c32ab23fe83172d9 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:23:55 +0000 Subject: [PATCH 5/5] Deprecate SUPPORT_*** only --- pylint/plugins/hass_imports.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index 125a4d957b35d..a6d65e353da50 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -26,10 +26,6 @@ class ObsoleteImportMatch: ), ], "homeassistant.components.light": [ - ObsoleteImportMatch( - reason="replaced by ColorMode enum", - constant=re.compile(r"^COLOR_MODE_(\w*)$"), - ), ObsoleteImportMatch( reason="replaced by LightEntityFeature enum", constant=re.compile(r"^SUPPORT_(EFFECT|FLASH|TRANSITION)$"),