Merge pull request #14208 from rallytime/pylint_fixes

Pylint fixes

salt/crypt.py

@@ -167,7 +167,6 @@ def gen_signature(priv_path, pub_path, sign_path):
     return True
 
 
-
 class MasterKeys(dict):
     '''
     The Master Keys class is used to manage the public key pair used for

salt/key.py

@@ -13,7 +13,6 @@ import fnmatch
 import hashlib
 import msgpack
 import json
-import binascii
 
 # Import salt libs
 import salt.crypt
@@ -315,7 +314,6 @@ class KeyCLI(object):
             if os.path.isfile(mpriv):
                 self.privkey = mpriv
 
-
         if not self.privkey:
             if self.opts['auto_create']:
                 print('Generating new signing key-pair {0}.* in {1}'
@@ -351,7 +349,6 @@ class KeyCLI(object):
                                self.pubkey,
                                sign_path)
 
-
     def run(self):
         '''
         Run the logic for saltkey
@@ -436,7 +433,6 @@ class Key(object):
                                         pubkey,
                                         sig_path)
 
-
     def check_minion_cache(self):
         '''
         Check the minion cache to make sure that old minion data is cleared

salt/transport/__init__.py

@@ -82,7 +82,7 @@ class RAETChannel(Channel):
         stack.addRemote(RemoteYard(stack=stack,
                                    name='manor',
                                    lanename=mid,
-                                   dirpath=self.opts['sock_dir'] ))
+                                   dirpath=self.opts['sock_dir']))
         log.debug("Created Channel Jobber Stack {0}\n".format(stack.name))
         return stack
 

salt/utils/parsers.py

@@ -1949,7 +1949,6 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
                   '; default=%default')
         )
 
-
         key_options_group.add_option(
             '--gen-signature',
             default=False,