Skip to content

Commit a3cfd51

Browse files
[pylint.message] Use MessageId for old names
1 parent ebb106e commit a3cfd51

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

pylint/message/message_definition.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ def __init__(
3030
self.scope = scope
3131
self.minversion = minversion
3232
self.maxversion = maxversion
33-
self.old_names = old_names or []
33+
self.old_names = []
34+
if old_names:
35+
for old_msgid, old_symbol in old_names:
36+
MessageId.check_msgid(old_msgid)
37+
old_message_id = MessageId(old_msgid, old_symbol)
38+
self.old_names.append(old_message_id)
3439

3540
@property
3641
def symbol(self):

pylint/message/message_definition_store.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ def register_message(self, message):
5353
self._check_symbol(message.msgid, message.symbol)
5454
self._check_msgid(message.msgid, message.symbol)
5555
for old_name in message.old_names:
56-
self._check_symbol(message.msgid, old_name[1])
56+
self._check_symbol(message.msgid, old_name.symbol)
5757
self._messages_definitions[message.symbol] = message
5858
self._register_alternative_name(message, message.msgid, message.symbol)
59-
for old_id, old_symbol in message.old_names:
60-
self._register_alternative_name(message, old_id, old_symbol)
59+
for old_message_id in message.old_names:
60+
self._register_alternative_name(
61+
message, old_message_id.msgid, old_message_id.symbol
62+
)
6163
self._msgs_by_category[message.msgid[0]].append(message.msgid)
6264

6365
def _register_alternative_name(self, msg, msgid, symbol):
@@ -78,9 +80,9 @@ def _check_symbol(self, msgid, symbol):
7880
if alternative_message.symbol == symbol:
7981
alternative_msgid = alternative_message.msgid
8082
else:
81-
for old_msgid, old_symbol in alternative_message.old_names:
82-
if old_symbol == symbol:
83-
alternative_msgid = old_msgid
83+
for old_message_id in alternative_message.old_names:
84+
if old_message_id.symbol == symbol:
85+
alternative_msgid = old_message_id.msgid
8486
break
8587
if msgid != alternative_msgid:
8688
self._raise_duplicate_msgid(symbol, msgid, alternative_msgid)
@@ -104,10 +106,10 @@ def _check_id_and_symbol_consistency(self, msgid, symbol):
104106
return None
105107
old_symbolic_name = None
106108
old_symbolic_id = None
107-
for alternate_msgid, alternate_symbol in alternative.old_names:
108-
if alternate_msgid == msgid or alternate_symbol == symbol:
109-
old_symbolic_id = alternate_msgid
110-
old_symbolic_name = alternate_symbol
109+
for old_message_id in alternative.old_names:
110+
if old_message_id.msgid == msgid or old_message_id.symbol == symbol:
111+
old_symbolic_id = old_message_id.msgid
112+
old_symbolic_name = old_message_id.symbol
111113
if symbol not in (alternative.symbol, old_symbolic_name):
112114
if msgid == old_symbolic_id:
113115
self._raise_duplicate_symbol(msgid, symbol, old_symbolic_name)

0 commit comments

Comments
 (0)