Fix existing 'use-symbolic-message-instead'

5 files changed, 4 insertions, 7 deletions

diff --git a/tests/functional/c/classes_meth_could_be_a_function.py b/tests/functional/c/classes_meth_could_be_a_function.py
index 59e585649..94103a324 100644
--- a/tests/functional/c/classes_meth_could_be_a_function.py
+++ b/tests/functional/c/classes_meth_could_be_a_function.py
@@ -1,4 +1,4 @@
-# pylint: disable=C0111,too-few-public-methods,W0232, useless-object-inheritance  # [use-symbolic-message-instead,use-symbolic-message-instead]
+# pylint: disable=missing-docstring,too-few-public-methods,no-init,useless-object-inheritance
 """
 #2479
 
@@ -18,7 +18,7 @@ class Aimpl(object):
     # disable "method could be a function" on classes which are not overriding
     # the factory method because in that case the usage of polymorphism is not
     # detected
-    # pylint: disable=R0201  # [use-symbolic-message-instead]
+    # pylint: disable=no-self-use
     def makex(self):
         return XAsub()
 
diff --git a/tests/functional/c/ctor_arguments.py b/tests/functional/c/ctor_arguments.py
index 8499e9374..ee10413e3 100644
--- a/tests/functional/c/ctor_arguments.py
+++ b/tests/functional/c/ctor_arguments.py
@@ -2,7 +2,7 @@
 
 Based on tests/functional/a/arguments.py
 """
-# pylint: disable=C0111,too-few-public-methods,W0231, useless-object-inheritance  # [use-symbolic-message-instead,use-symbolic-message-instead]
+# pylint: disable=missing-docstring,too-few-public-methods,super-init-not-called,useless-object-inheritance
 
 
 class Class1Arg(object):
diff --git a/tests/functional/c/ctor_arguments.txt b/tests/functional/c/ctor_arguments.txt
index f08ccdec5..781715c0a 100644
--- a/tests/functional/c/ctor_arguments.txt
+++ b/tests/functional/c/ctor_arguments.txt
@@ -1,5 +1,3 @@
-use-symbolic-message-instead:5:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
-use-symbolic-message-instead:5:0::"'W0231' is cryptic: use '# pylint: disable=super-init-not-called' instead"
 no-value-for-parameter:35:0::No value for argument 'first_argument' in constructor call
 too-many-function-args:36:0::Too many positional arguments for constructor call
 no-value-for-parameter:38:0::No value for argument 'third_argument' in constructor call
diff --git a/tests/functional/u/unused/unused_argument.py b/tests/functional/u/unused/unused_argument.py
index a1018453f..707eb25af 100644
--- a/tests/functional/u/unused/unused_argument.py
+++ b/tests/functional/u/unused/unused_argument.py
@@ -76,7 +76,7 @@ class AAAA(object):
                     description=[(etype,)]*size)
         def inner(row, col=0, etype=etype, req=self, rset=rset):
             """inner using all its argument"""
-            # pylint: disable = E1103  # [use-symbolic-message-instead]
+            # pylint: disable=maybe-no-member
             return req.vreg.etype_class(etype)(req, rset, row, col)
         # pylint: disable = attribute-defined-outside-init
         rset.get_entity = inner
diff --git a/tests/functional/u/unused/unused_argument.txt b/tests/functional/u/unused/unused_argument.txt
index 1e59f7cc5..b1ad4ad5a 100644
--- a/tests/functional/u/unused/unused_argument.txt
+++ b/tests/functional/u/unused/unused_argument.txt
@@ -5,5 +5,4 @@ unused-argument:54:13:function:Unused argument 'arg'
 unused-argument:61:21:AAAA.method:Unused argument 'arg':INFERENCE
 unused-argument:68:0:AAAA.selected:Unused argument 'args':INFERENCE
 unused-argument:68:0:AAAA.selected:Unused argument 'kwargs':INFERENCE
-use-symbolic-message-instead:79:0::"'E1103' is cryptic: use '# pylint: disable=maybe-no-member' instead"
 unused-argument:87:23:BBBB.__init__:Unused argument 'arg':INFERENCE