Merge pull request #22206 from s0undt3ch/hotfix/pep8-disables

more pylint disables

.pylintrc

@@ -52,7 +52,9 @@ disable=W0142,
   C0330,
   I0011,
   I0012,
-  E8402
+  W1202,
+  E8402,
+  E8731
 #  E8121,
 #  E8122,
 #  E8123,
@@ -65,9 +67,11 @@ disable=W0142,
 # Disabled Checks
 #
 # W0142 (star-args)
+# W1202 (logging-format-interpolation) Use % formatting in logging functions but pass the % parameters as arguments
 # E812* All PEP8 E12*
 # E8402 module level import not at top of file
 # E8501 PEP8 line too long
+# E8731 do not assign a lambda expression, use a def
 # C0330 (bad-continuation)
 # I0011 (locally-disabling)
 # I0012 (locally-enabling)

.testing.pylintrc

@@ -67,6 +67,7 @@ disable=R,
   W0622,
   W0631,
   W0704,
+  W1202,
   F0220,
   F0401,
   E8501,
@@ -81,7 +82,8 @@ disable=R,
   E8129,
   E8131,
   E8265,
-  E8402
+  E8402,
+  E8731
 
 # Disabled:
 # R* [refactoring suggestions & reports]
@@ -114,11 +116,13 @@ disable=R,
 # W0704 (pointless-except) [misnomer; "ignores the exception" rather than "pointless"]
 # F0220 (unresolved-interface)
 # F0401 (import-error)
+# W1202 (logging-format-interpolation) Use % formatting in logging functions but pass the % parameters as arguments
 #
 # E812* All PEP8 E12*
 # E8265 PEP8 E265 - block comment should start with "# "
 # E8501 PEP8 line too long
 # E8402 module level import not at top of file
+# E8731 do not assign a lambda expression, use a def
 
 [REPORTS]
 

salt/client/ssh/ssh_py_shim.py

@@ -34,7 +34,7 @@ class OBJ(object):
 # The below line is where OPTIONS can be redefined with internal options
 # (rather than cli arguments) when the shim is bundled by
 # client.ssh.Single._cmd_str()
-# pylint: disable=block-comment-should-start-with-'# '
+# pylint: disable=block-comment-should-start-with-cardinal-space
 #%%OPTS