From 7ef71df81bd3b2abbc66e28deb0f6a72f9be25f3 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <roman.zeyde@gmail.com>
Date: Tue, 16 Jun 2015 10:33:48 +0300
Subject: [PATCH] pylint: fix issues

---
 .pylintrc                |  2 ++
 sshagent/formats.py      |  4 ++--
 sshagent/protocol.py     |  2 +-
 sshagent/trezor.py       | 12 ++++++------
 sshagent/trezor_agent.py |  2 --
 sshagent/util.py         |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 .pylintrc

diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000..d1a06c5
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,2 @@
+[MESSAGES CONTROL]
+disable=invalid-name, missing-docstring
diff --git a/sshagent/formats.py b/sshagent/formats.py
index 90d6b8b..bacc843 100644
--- a/sshagent/formats.py
+++ b/sshagent/formats.py
@@ -75,6 +75,6 @@ def export_public_key(pubkey, label):
                                               hashfunc=hashfunc)
     key_type = 'ecdsa-sha2-nistp256'
     curve_name = 'nistp256'
-    blobs = map(util.frame, [key_type, curve_name, '\x04' + vk.to_string()])
-    b64 = base64.b64encode(''.join(blobs))
+    parts = [key_type, curve_name, '\x04' + vk.to_string()]
+    b64 = base64.b64encode(''.join([util.frame(p) for p in parts]))
     return '{} {} {}\n'.format(key_type, b64, label)
diff --git a/sshagent/protocol.py b/sshagent/protocol.py
index cb87c7c..8a40881 100644
--- a/sshagent/protocol.py
+++ b/sshagent/protocol.py
@@ -50,7 +50,7 @@ def sign_message(buf, keys, signer):
         raise ValueError('key not found')
 
     log.debug('signing %d-byte blob', len(blob))
-    r, s = signer(label=k['name'], blob=blob)
+    r, s = signer(label=key['name'], blob=blob)
     signature = (r, s)
     log.debug('signature: %s', signature)
 
diff --git a/sshagent/trezor.py b/sshagent/trezor.py
index b108a41..70b3891 100644
--- a/sshagent/trezor.py
+++ b/sshagent/trezor.py
@@ -21,12 +21,12 @@ class Client(object):
         client = TrezorClient(HidTransport(devices[0]))
         f = client.features
         log.info('connected to Trezor')
-        log.debug('ID       : {}'.format(f.device_id))
-        log.debug('label    : {}'.format(f.label))
-        log.debug('vendor   : {}'.format(f.vendor))
+        log.debug('ID       : %s', f.device_id)
+        log.debug('label    : %s', f.label)
+        log.debug('vendor   : %s', f.vendor)
         version = [f.major_version, f.minor_version, f.patch_version]
-        log.debug('version  : {}'.format('.'.join(map(str, version))))
-        log.debug('revision : {}'.format(binascii.hexlify(f.revision)))
+        log.debug('version  : %s', '.'.join([str(v) for v in version]))
+        log.debug('revision : %s', binascii.hexlify(f.revision))
         self.client = client
 
     def close(self):
@@ -55,7 +55,7 @@ class Client(object):
 
 
 def _get_identity(label, proto='ssh'):
-        return IdentityType(host=label, proto=proto)
+    return IdentityType(host=label, proto=proto)
 
 
 def _get_address(ident):
diff --git a/sshagent/trezor_agent.py b/sshagent/trezor_agent.py
index 8cb9207..2723248 100644
--- a/sshagent/trezor_agent.py
+++ b/sshagent/trezor_agent.py
@@ -45,8 +45,6 @@ def main():
         log.info('exitcode: %d', ret)
     except KeyboardInterrupt:
         log.info('server stopped')
-    except Exception as e:
-        log.warning(e, exc_info=True)
     sys.exit(ret)
 
 if __name__ == '__main__':
diff --git a/sshagent/util.py b/sshagent/util.py
index 49a925c..eeac94f 100644
--- a/sshagent/util.py
+++ b/sshagent/util.py
@@ -47,7 +47,7 @@ def bytes2num(s):
 
 def num2bytes(value, size):
     res = []
-    for i in range(size):
+    for _ in range(size):
         res.append(value & 0xFF)
         value = value >> 8
     assert value == 0