Also use the proper way of checking for enabled messages for leave_* methods.

2 files changed, 7 insertions, 5 deletions

diff --git a/test/test_utils.py b/test/test_utils.py
index f78aaae..282826b 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -41,6 +41,10 @@ class PyLintASTWalkerTest(TestCase):
         def visit_assname(self, module):
             self.called.add('assname')
 
+        @check_messages('second-message')
+        def leave_assname(self, module):
+            raise NotImplementedError
+
     def testCheckMessages(self):
         linter = self.MockLinter({'first-message': True,
                                   'second-message': False,
diff --git a/utils.py b/utils.py
index d9e53d9..3507b70 100644
--- a/utils.py
+++ b/utils.py
@@ -624,11 +624,9 @@ class PyLintASTWalker(object):
             elif member.startswith('leave_'):
                 l_meth = getattr(checker, member)
                 # don't use leave_methods with no activated message:
-                if hasattr(l_meth, 'checks_msgs'):
-                    if not any(msgs.get(m, True) for m in l_meth.checks_msgs):
-                        continue
-                leaves.setdefault(cid, []).append(l_meth)
-                lcids.add(cid)
+                if self._is_method_enabled(l_meth):
+                    leaves.setdefault(cid, []).append(l_meth)
+                    lcids.add(cid)
         visit_default = getattr(checker, 'visit_default', None)
         if visit_default:
             for cls in nodes.ALL_NODE_CLASSES: