Merge pull request #13939 from nmadhok/fix-pylint

Fixing lint

salt/daemons/flo/core.py

@@ -66,7 +66,7 @@ class SaltRaetCleanup(ioflo.base.deeding.Deed):
     Ioinits = {
                 'opts': '.salt.opts',
                 'basedirpath': {'ipath': '.salt.raet.basedirpath',
-                                'ival': '',},
+                                'ival': ''}
             }
 
     def postinitio(self):
@@ -74,7 +74,7 @@ class SaltRaetCleanup(ioflo.base.deeding.Deed):
         Initialize value of data store share for .salt.raet.basedirpath
         Will override if empty value
         '''
-        if not self.basedirpath.value: # override if empty
+        if not self.basedirpath.value:  # override if empty
             self.basedirpath.value = os.path.abspath(
                     os.path.join(self.opts.value['cachedir'], 'raet'))
 
@@ -105,7 +105,6 @@ class SaltRaetCleanup(ioflo.base.deeding.Deed):
                     shutil.rmtree(dirpath)
 
 
-
 class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
     '''
     Initialize and run raet udp stack for Salt
@@ -129,7 +128,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
                                'localname': 'master',
                                'eid': 0,
                                'sigkey': None,
-                               'prikey': None,}},
+                               'prikey': None}},
             'basedirpath': {'ipath': '.salt.raet.basedirpath',
                             'ival': ''},
             }
@@ -159,7 +158,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
 
         ha = (self.opts.value['interface'], self.opts.value['raet_port'])
 
-        basedirpath = self.basedirpath.value # must be assigned elsewhere
+        basedirpath = self.basedirpath.value  # must be assigned elsewhere
 
         local = LocalEstate(
                 eid=eid,
@@ -186,7 +185,8 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
                 period=3.0,
                 offset=0.5)
 
-class SaltRaetRoadStackCloser(ioflo.base.deeding.Deed):  # pylint: disable=W0232
+
+class SaltRaetRoadStackCloser(ioflo.base.deeding.Deed):
     '''
     Closes stack server socket connection
     FloScript:
@@ -581,7 +581,7 @@ class SaltManorLaneSetup(ioflo.base.deeding.Deed):
                                    'yid': 0,
                                    'lanename': 'master'}},
                'basedirpath': {'ipath': '.salt.raet.basedirpath',
-                               'ival': '',},
+                               'ival': ''}
             }
 
     def postinitio(self):
@@ -590,7 +590,6 @@ class SaltManorLaneSetup(ioflo.base.deeding.Deed):
         '''
         pass
 
-
     def action(self):
         '''
         Run once at enter
@@ -599,7 +598,7 @@ class SaltManorLaneSetup(ioflo.base.deeding.Deed):
         localname = self.opts.value.get('id', self.local.data.localname)
         lanename = self.opts.value.get('id', self.local.data.lanename)
         yid = self.local.data.yid
-        basedirpath = self.basedirpath.value # must be assigned elsewhere
+        basedirpath = self.basedirpath.value  # must be assigned elsewhere
 
         #os.path.abspath(os.path.join(self.opts.value['cachedir'], 'raet'))
         self.stack.value = LaneStack(

salt/modules/tls.py

@@ -169,6 +169,7 @@ def maybe_fix_ssl_version(ca_name):
                     emailAddress=subj.emailAddress,
                     fixmode=True)
 
+
 def _ca_exists(ca_name):
     '''
     Verify whether a Certificate Authority (CA) already exists

tests/integration/shell/auth.py

@@ -21,6 +21,7 @@ from salttesting import skipIf
 import random
 import pwd
 
+
 class AuthTest(integration.ShellCase):
     '''
     Test auth mechanisms
@@ -39,7 +40,6 @@ class AuthTest(integration.ShellCase):
         except KeyError:
             self.run_call('user.add saltdev createhome=False')
 
-
     def test_pam_auth_valid_user(self):
         '''
         test pam auth mechanism is working with a valid user