From a1586ef4f6c5338fac7cd0dc532e5bc8b1d6e8d2 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 31 Mar 2015 19:13:58 +0100
Subject: [PATCH 1/3] Ignore `E8731` - do not assign a lambda expression, use a
 def

---
 .pylintrc         | 4 +++-
 .testing.pylintrc | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index eec5442c8d0d..9d0f4d1d642b 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -52,7 +52,8 @@ disable=W0142,
   C0330,
   I0011,
   I0012,
-  E8402
+  E8402,
+  E8731
 #  E8121,
 #  E8122,
 #  E8123,
@@ -68,6 +69,7 @@ disable=W0142,
 # 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)
diff --git a/.testing.pylintrc b/.testing.pylintrc
index 43fbfd073f73..43fd2cc605b7 100644
--- a/.testing.pylintrc
+++ b/.testing.pylintrc
@@ -81,7 +81,8 @@ disable=R,
   E8129,
   E8131,
   E8265,
-  E8402
+  E8402,
+  E8731
 
 # Disabled:
 # R* [refactoring suggestions & reports]
@@ -119,6 +120,7 @@ disable=R,
 # 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]
 

From ca615cd92d2c2f9ee69ea3ec62f2f983b8e83062 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 31 Mar 2015 19:21:30 +0100
Subject: [PATCH 2/3] Ignore `W1202` (logging-format-interpolation)

"Use % formatting in logging functions but pass the % parameters as arguments"
---
 .pylintrc         | 2 ++
 .testing.pylintrc | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.pylintrc b/.pylintrc
index 9d0f4d1d642b..67985ae79d45 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -52,6 +52,7 @@ disable=W0142,
   C0330,
   I0011,
   I0012,
+  W1202,
   E8402,
   E8731
 #  E8121,
@@ -66,6 +67,7 @@ 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
diff --git a/.testing.pylintrc b/.testing.pylintrc
index 43fd2cc605b7..65fa5ee59ed2 100644
--- a/.testing.pylintrc
+++ b/.testing.pylintrc
@@ -67,6 +67,7 @@ disable=R,
   W0622,
   W0631,
   W0704,
+  W1202,
   F0220,
   F0401,
   E8501,
@@ -115,6 +116,7 @@ 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 "# "

From 30cf5f44d5fc63dfcc014c1d7e6afd37356a0904 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 31 Mar 2015 23:32:55 +0100
Subject: [PATCH 3/3] Update to the new disable alias

---
 salt/client/ssh/ssh_py_shim.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/client/ssh/ssh_py_shim.py b/salt/client/ssh/ssh_py_shim.py
index c9bda4d7b193..5251c61f24bd 100644
--- a/salt/client/ssh/ssh_py_shim.py
+++ b/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