From 43792243f4cc9d79d3b653aee2de2e8ba37f8d77 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Fri, 21 Jun 2019 13:37:30 +0200 Subject: [pylint.message] Move backward compatibility in MessageDefinition If we need this mechanism it's better to handle it everywhere. --- pylint/message/message_definition.py | 3 +++ pylint/message/message_handler_mix_in.py | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'pylint/message') diff --git a/pylint/message/message_definition.py b/pylint/message/message_definition.py index 873cdc3b8..2d8cd2997 100644 --- a/pylint/message/message_definition.py +++ b/pylint/message/message_definition.py @@ -31,6 +31,9 @@ class MessageDefinition: self.msgid = msgid self.msg = msg self.description = description + if not symbol: + # backward compatibility, message may not have a symbol + symbol = msgid self.symbol = symbol self.scope = scope self.minversion = minversion diff --git a/pylint/message/message_handler_mix_in.py b/pylint/message/message_handler_mix_in.py index 8140c5d2f..0750c9ee6 100644 --- a/pylint/message/message_handler_mix_in.py +++ b/pylint/message/message_handler_mix_in.py @@ -271,8 +271,6 @@ class MessagesHandlerMixIn: def add_one_message( self, message_definition, line, node, args, confidence, col_offset ): - # backward compatibility, message may not have a symbol - symbol = message_definition.symbol or message_definition.msgid self.check_message_definition(message_definition, line, node) if line is None and node is not None: line = node.fromlineno @@ -298,9 +296,9 @@ class MessagesHandlerMixIn: self.stats[msg_cat] += 1 self.stats["by_module"][self.current_name][msg_cat] += 1 try: - self.stats["by_msg"][symbol] += 1 + self.stats["by_msg"][message_definition.symbol] += 1 except KeyError: - self.stats["by_msg"][symbol] = 1 + self.stats["by_msg"][message_definition.symbol] = 1 # expand message ? msg = message_definition.msg if args: @@ -317,7 +315,7 @@ class MessagesHandlerMixIn: self.reporter.handle_message( Message( message_definition.msgid, - symbol, + message_definition.symbol, (abspath, path, module, obj, line or 1, col_offset or 0), msg, confidence, -- cgit v1.2.1