[pylint.message] Symbol seems to never be None anymore

Author: Pierre-Sassoulas

pylint/message/message_definition.py

@@ -29,12 +29,9 @@ def __init__(
         if not msgid[0] in MSG_TYPES:
             raise InvalidMessageError("Bad message type %s in %r" % (msgid[0], msgid))
         self.msgid = msgid
+        self.symbol = symbol
         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
         self.maxversion = maxversion
@@ -60,10 +57,6 @@ def format_help(self, checkerref=False):
         if checkerref:
             desc += " This message belongs to the %s checker." % self.checker.name
         title = self.msg
-        if self.symbol:
-            msgid = "%s (%s)" % (self.symbol, self.msgid)
-        else:
-            msgid = self.msgid
         if self.minversion or self.maxversion:
             restr = []
             if self.minversion:
@@ -75,9 +68,9 @@ def format_help(self, checkerref=False):
                 desc += " It can't be emitted when using Python %s." % restr
             else:
                 desc += " This message can't be emitted when using Python %s." % restr
-        desc = normalize_text(" ".join(desc.split()), indent="  ")
+        msg_help = normalize_text(" ".join(desc.split()), indent="  ")
+        message_id = "%s (%s)" % (self.symbol, self.msgid)
         if title != "%s":
             title = title.splitlines()[0]
-
-            return ":%s: *%s*\n%s" % (msgid, title.rstrip(" "), desc)
-        return ":%s:\n%s" % (msgid, desc)
+            return ":%s: *%s*\n%s" % (message_id, title.rstrip(" "), msg_help)
+        return ":%s:\n%s" % (message_id, msg_help)

pylint/message/message_definition_store.py

@@ -171,10 +171,7 @@ def get_message_definitions(self, msgid_or_symbol: str) -> list:
         raise UnknownMessageError(error_msg)
 
     def get_msg_display_string(self, msgid):
-        """Generates a user-consumable representation of a message.
-
-        Can be just the message ID or the ID and the symbol.
-        """
+        """Generates a user-consumable representation of a message. """
         message_definitions = self.get_message_definitions(msgid)
         if len(message_definitions) == 1:
             return repr(message_definitions[0].symbol)