From 43bd955096da8634a6549feef574b6f72825e71e Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Mon, 14 Jul 2014 12:23:52 -0600
Subject: [PATCH] Pylint fixes

---
 salt/crypt.py              | 1 -
 salt/key.py                | 4 ----
 salt/transport/__init__.py | 2 +-
 salt/utils/parsers.py      | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/salt/crypt.py b/salt/crypt.py
index 2fd6125ae6..2999c2273c 100644
--- a/salt/crypt.py
+++ b/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
diff --git a/salt/key.py b/salt/key.py
index 499b7ce3cb..ece9747e10 100644
--- a/salt/key.py
+++ b/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
diff --git a/salt/transport/__init__.py b/salt/transport/__init__.py
index ebd25b94ed..04a32f1289 100644
--- a/salt/transport/__init__.py
+++ b/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
 
diff --git a/salt/utils/parsers.py b/salt/utils/parsers.py
index ba5b2be729..8ca10048d7 100644
--- a/salt/utils/parsers.py
+++ b/salt/utils/parsers.py
@@ -1949,7 +1949,6 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
                   '; default=%default')
         )
 
-
         key_options_group.add_option(
             '--gen-signature',
             default=False,