Skip to content

Commit a5ca674

Browse files
[deleted messages] Fix helper function for old names of deleted messages
Previousely they were considered unknown names.
1 parent 92f28ce commit a5ca674

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

pylint/message/_deleted_message_ids.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ def is_deleted_symbol(symbol: str) -> str | None:
131131
"""Return the explanation for removal if the message was removed."""
132132
for explanation, deleted_messages in DELETED_MESSAGES_IDS.items():
133133
for deleted_message in deleted_messages:
134-
if symbol == deleted_message.symbol:
134+
if symbol == deleted_message.symbol or any(
135+
symbol == m[1] for m in deleted_message.old_names
136+
):
135137
return explanation
136138
return None
137139

@@ -141,6 +143,8 @@ def is_deleted_msgid(msgid: str) -> str | None:
141143
"""Return the explanation for removal if the message was removed."""
142144
for explanation, deleted_messages in DELETED_MESSAGES_IDS.items():
143145
for deleted_message in deleted_messages:
144-
if msgid == deleted_message.msgid:
146+
if msgid == deleted_message.msgid or any(
147+
msgid == m[0] for m in deleted_message.old_names
148+
):
145149
return explanation
146150
return None

tests/functional/b/bad_option_value.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
# pylint:enable=W1622 # [useless-option-value]
2222

2323
# Standard disable with deleted old name symbol of deleted message
24-
# pylint: disable=no-space-after-operator # [bad-option-value] <= This is wrong
24+
# pylint: disable=no-space-after-operator # [useless-option-value]
2525
# Standard disable with deleted old name msgid of deleted message
26-
# pylint: disable=C0323 # [bad-option-value] <= This is wrong
26+
# pylint: disable=C0323 # [useless-option-value]

tests/functional/b/bad_option_value.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ useless-option-value:14:0:None:None::"Useless option value for 'disable-next', '
77
unknown-option-value:17:0:None:None::Unknown option value for 'enable', expected a valid pylint message and got 'W04044':HIGH
88
useless-option-value:19:0:None:None::"Useless option value for 'enable', 'dict-values-not-iterating' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942.":HIGH
99
useless-option-value:21:0:None:None::"Useless option value for 'enable', 'W1622' was removed from pylint, see https://github.com/PyCQA/pylint/pull/4942.":HIGH
10-
bad-option-value:24:0:None:None::Bad option value for 'disable', expected a valid pylint message and got 'no-space-after-operator':HIGH
11-
bad-option-value:26:0:None:None::Bad option value for 'disable', expected a valid pylint message and got 'C0323':HIGH
10+
useless-option-value:24:0:None:None::"Useless option value for 'disable', 'no-space-after-operator' was removed from pylint, see https://github.com/PyCQA/pylint/pull/3577.":HIGH
11+
useless-option-value:26:0:None:None::"Useless option value for 'disable', 'C0323' was removed from pylint, see https://github.com/PyCQA/pylint/pull/3577.":HIGH

0 commit comments

Comments
 (0)