Skip to content

Commit c92e3ab

Browse files
Fix disabled warning not ignored (#4268)
* Fix ignores all disabled warnings #4265 * Update changelog and prepare 2.7.4
1 parent c1c41b8 commit c92e3ab

File tree

5 files changed

+26
-7
lines changed

5 files changed

+26
-7
lines changed

ChangeLog

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ Release date: Undefined
1313

1414
What's New in Pylint 2.7.4?
1515
===========================
16-
Release date: Undefined
16+
Release date: 2021-03-30
1717

1818
..
1919
Put bug fixes that will be cherry-picked to latest major version here
2020

21+
22+
* Fix a problem with disabled msgid not being ignored
23+
24+
Closes #4265
25+
2126
* Fix issue with annotated class constants
2227

2328
* Closes #4264

pylint/__pkginfo__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
from os.path import join
3232

3333
# For an official release, use dev_version = None
34-
numversion = (2, 8, 0)
35-
dev_version = 1
34+
numversion = (2, 7, 4)
35+
dev_version = None
3636

3737
version = ".".join(str(num) for num in numversion)
3838
if dev_version is not None:

pylint/message/message_handler_mix_in.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ def get_by_id_managed_msgs(cls):
4545
def _register_by_id_managed_msg(self, msgid_or_symbol: str, line, is_disabled=True):
4646
"""If the msgid is a numeric one, then register it to inform the user
4747
it could furnish instead a symbolic msgid."""
48-
if msgid_or_symbol[1:].isdigit():
49-
symbol = self.msgs_store.message_id_store.get_symbol(msgid=msgid_or_symbol) # type: ignore
50-
managed = (self.current_name, msgid_or_symbol, symbol, line, is_disabled) # type: ignore
51-
MessagesHandlerMixIn.__by_id_managed_msgs.append(managed)
48+
try:
49+
if msgid_or_symbol[1:].isdigit():
50+
symbol = self.msgs_store.message_id_store.get_symbol(msgid=msgid_or_symbol) # type: ignore
51+
msgid = msgid_or_symbol
52+
managed = (self.current_name, msgid, symbol, line, is_disabled) # type: ignore
53+
MessagesHandlerMixIn.__by_id_managed_msgs.append(managed)
54+
except KeyError:
55+
pass
5256

5357
def disable(self, msgid, scope="package", line=None, ignore_unknown=False):
5458
"""Don't output message of the given id"""
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"""https://github.com/PyCQA/pylint/issues/4265"""
2+
3+
try:
4+
f = open('test')
5+
except Exception:
6+
pass
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[MESSAGES CONTROL]
2+
3+
disable=
4+
C0111,C0326,W0703

0 commit comments

Comments
 (0)