jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 12:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use past tense in messages for already invalidated deprecated configs (#36591)

Browse Source
This commit is contained in:
Ville Skyttä 2020-06-10 09:26:55 +03:00 committed by GitHub
parent 29838ce1ed
commit 29b8f76e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/helpers/config_validation.py
View File

@ -659,7 +659,7 @@ def deprecated(
warning = ( warning = (
"The '{key}' option is deprecated," "The '{key}' option is deprecated,"
" please replace it with '{replacement_key}'." " please replace it with '{replacement_key}'."
" This option will become invalid in version" " This option {invalidation_status} invalid in version"
" {invalidation_version}" " {invalidation_version}"
) )
elif replacement_key: elif replacement_key:
@ -671,7 +671,7 @@ def deprecated(
warning = ( warning = (
"The '{key}' option is deprecated," "The '{key}' option is deprecated,"
" please remove it from your configuration." " please remove it from your configuration."
" This option will become invalid in version" " This option {invalidation_status} invalid in version"
" {invalidation_version}" " {invalidation_version}"
) )
else: else:
@ -690,6 +690,7 @@ def deprecated(
warning.format( warning.format(
key=key, key=key,
replacement_key=replacement_key, replacement_key=replacement_key,
invalidation_status="became",
invalidation_version=invalidation_version, invalidation_version=invalidation_version,
) )
) )
@ -702,6 +703,7 @@ def deprecated(
warning, warning,
key=key, key=key,
replacement_key=replacement_key, replacement_key=replacement_key,
invalidation_status="will become",
invalidation_version=invalidation_version, invalidation_version=invalidation_version,
) )

8
tests/helpers/test_config_validation.py
View File

@ -642,8 +642,8 @@ def test_deprecated_with_invalidation_version(caplog, schema, version):
invalidated_schema(test_data) invalidated_schema(test_data)
assert str(exc_info.value) == ( assert str(exc_info.value) == (
"The 'mars' option is deprecated, " "The 'mars' option is deprecated, "
"please remove it from your configuration. This option will " "please remove it from your configuration. This option became "
"become invalid in version 0.1.0" "invalid in version 0.1.0"
) )
@ -702,7 +702,7 @@ def test_deprecated_with_replacement_key_and_invalidation_version(
invalidated_schema(test_data) invalidated_schema(test_data)
assert str(exc_info.value) == ( assert str(exc_info.value) == (
"The 'mars' option is deprecated, " "The 'mars' option is deprecated, "
"please replace it with 'jupiter'. This option will become " "please replace it with 'jupiter'. This option became "
"invalid in version 0.1.0" "invalid in version 0.1.0"
) )
@ -851,7 +851,7 @@ def test_deprecated_with_replacement_key_invalidation_version_default(
invalidated_schema(test_data) invalidated_schema(test_data)
assert str(exc_info.value) == ( assert str(exc_info.value) == (
"The 'mars' option is deprecated, " "The 'mars' option is deprecated, "
"please replace it with 'jupiter'. This option will become " "please replace it with 'jupiter'. This option became "
"invalid in version 0.1.0" "invalid in version 0.1.0"
) )