Merge pull request #11972 from s0undt3ch/hotfix/jenkins

Several Lint Fixes

salt/daemons/flo/core.py

@@ -106,6 +106,7 @@ class StackUdpRaetSalt(ioflo.base.deeding.Deed):
                 rxMsgs=rxMsgs)
         self.stack.value.Bk = raeting.bodyKinds.msgpack
 
+
 class CloserStackUdpRaetSalt(ioflo.base.deeding.Deed):  # pylint: disable=W0232
     '''
     CloserStackUdpRaetSalt closes stack server socket connection
@@ -121,6 +122,7 @@ class CloserStackUdpRaetSalt(ioflo.base.deeding.Deed):  # pylint: disable=W0232
         if self.stack.value and isinstance(self.stack.value, RoadStack):
             self.stack.value.server.close()
 
+
 class JoinerStackUdpRaetSalt(ioflo.base.deeding.Deed):
     '''
     Initiates join transaction with master
@@ -143,6 +145,7 @@ class JoinerStackUdpRaetSalt(ioflo.base.deeding.Deed):
         if stack and isinstance(stack, RoadStack):
             stack.join(mha=self.mha)
 
+
 class JoinedStackUdpRaetSalt(ioflo.base.deeding.Deed):
     '''
     Updates status with .joined of zeroth remote estate (master)
@@ -184,6 +187,7 @@ class AllowerStackUdpRaetSalt(ioflo.base.deeding.Deed):
             stack.allow()
         return None
 
+
 class AllowedStackUdpRaetSalt(ioflo.base.deeding.Deed):
     '''
     Updates status with .allowed of zeroth remote estate (master)
@@ -206,6 +210,7 @@ class AllowedStackUdpRaetSalt(ioflo.base.deeding.Deed):
                 allowed = stack.remotes.values()[0].allowed
         self.status.update(allowed=allowed)
 
+
 class ModulesLoad(ioflo.base.deeding.Deed):
     '''
     Reload the minion modules

salt/utils/cloud.py

@@ -1394,12 +1394,12 @@ def scp_file(dest_path, contents, kwargs):
         ssh_args.extend([
             # Setup ProxyCommand
             '-oProxyCommand="ssh {0} {1} {2} {3} {4}@{5} -p {6} nc -q0 %h %p"'.format(
-        	# Don't add new hosts to the host key database
-        	'-oStrictHostKeyChecking=no',
-        	# Set hosts key database path to /dev/null, ie, non-existing
-        	'-oUserKnownHostsFile=/dev/null',
-        	# Don't re-use the SSH connection. Less failures.
-        	'-oControlPath=none',
+            # Don't add new hosts to the host key database
+            '-oStrictHostKeyChecking=no',
+            # Set hosts key database path to /dev/null, ie, non-existing
+            '-oUserKnownHostsFile=/dev/null',
+            # Don't re-use the SSH connection. Less failures.
+            '-oControlPath=none',
                 ssh_gateway_key,
                 ssh_gateway_user,
                 ssh_gateway,

salt/utils/thin.py

@@ -18,7 +18,7 @@ try:
 except ImportError:
     # Import the bundled package
     try:
-        from requests.packages import urllib3
+        from requests.packages import urllib3  # pylint: disable=E0611
         HAS_URLLIB3 = True
     except ImportError:
         HAS_URLLIB3 = False
@@ -28,7 +28,7 @@ try:
 except ImportError:
     # Import the bundled package
     try:
-        from requests.packages.urllib3.packages import six
+        from requests.packages.urllib3.packages import six  # pylint: disable=E0611
         HAS_SIX = True
     except ImportError:
         HAS_SIX = False