Fix a few pylint issues

.travis.yml

@@ -10,7 +10,7 @@ install:
 
 script:
   - pep8 trezor_agent
-  - pylint --report=no --rcfile .pylintrc trezor_agent
+  - pylint --reports=no --rcfile .pylintrc trezor_agent
   - coverage run --source trezor_agent/ -m py.test -v
 
 after_success:

tox.ini

@@ -7,9 +7,8 @@ deps=
     pep8
     coverage
     pylint
-    six
 commands=
     pep8 trezor_agent
-    pylint --report=no --rcfile .pylintrc trezor_agent
+    pylint --reports=no --rcfile .pylintrc trezor_agent
     coverage run --omit='trezor_agent/__main__.py' --source trezor_agent -m py.test -v trezor_agent
     coverage report

trezor_agent/__main__.py

@@ -4,12 +4,12 @@ import sys
 import argparse
 import subprocess
 import functools
+import logging
 
 from . import trezor
 from . import server
 from . import formats
 
-import logging
 log = logging.getLogger(__name__)
 
 
@@ -65,10 +65,11 @@ def create_agent_parser():
                    help='run ${SHELL} as subprocess under SSH agent')
     g.add_argument('-c', '--connect', default=False, action='store_true',
                    help='connect to specified host via SSH')
-    curves = ', '.join(sorted(formats.SUPPORTED_CURVES))
+    curve_names = [name.decode('ascii') for name in formats.SUPPORTED_CURVES]
+    curve_names = ', '.join(sorted(curve_names))
     p.add_argument('-e', '--ecdsa-curve-name', metavar='CURVE',
                    default=formats.CURVE_NIST256,
-                   help='specify ECDSA curve name: ' + curves)
+                   help='specify ECDSA curve name: ' + curve_names)
     p.add_argument('command', type=str, nargs='*', metavar='ARGUMENT',
                    help='command to run under the SSH agent')
     return p

trezor_agent/formats.py

@@ -1,12 +1,12 @@
 import io
 import hashlib
 import base64
+import logging
 import ecdsa
 import ed25519
 
 from . import util
 
-import logging
 log = logging.getLogger(__name__)
 
 # Supported ECDSA curves
@@ -52,11 +52,11 @@ def parse_pubkey(blob):
 
         curve = ecdsa.NIST256p
         point = ecdsa.ellipticcurve.Point(curve.curve, *coords)
-        vk = ecdsa.VerifyingKey.from_public_point(point, curve, hashfunc)
 
         def ecdsa_verifier(sig, msg):
             assert len(sig) == 2 * size
             sig_decode = ecdsa.util.sigdecode_string
+            vk = ecdsa.VerifyingKey.from_public_point(point, curve, hashfunc)
             vk.verify(signature=sig, data=msg, sigdecode=sig_decode)
             parts = [sig[:size], sig[size:]]
             return b''.join([util.frame(b'\x00' + p) for p in parts])
@@ -67,10 +67,10 @@ def parse_pubkey(blob):
     if key_type == SSH_ED25519_KEY_TYPE:
         pubkey = util.read_frame(s)
         assert s.read() == b''
-        vk = ed25519.VerifyingKey(pubkey)
 
         def ed25519_verify(sig, msg):
             assert len(sig) == 64
+            vk = ed25519.VerifyingKey(pubkey)
             vk.verify(sig, msg)
             return sig
 

trezor_agent/protocol.py

@@ -1,10 +1,10 @@
 import io
 import binascii
+import logging
 
 from . import util
 from . import formats
 
-import logging
 log = logging.getLogger(__name__)
 
 SSH_AGENTC_REQUEST_RSA_IDENTITIES = 1
@@ -87,7 +87,8 @@ class Handler(object):
             raise MissingKey('key not found')
 
         log.debug('signing %d-byte blob', len(blob))
-        signature = self.signer(label=key['name'], blob=blob)
+        label = key['name'].decode('ascii')  # label should be a string
+        signature = self.signer(label=label, blob=blob)
         log.debug('signature: %s', binascii.hexlify(signature))
 
         try:

trezor_agent/server.py

@@ -4,12 +4,12 @@ import subprocess
 import tempfile
 import contextlib
 import threading
+import logging
 
 from . import protocol
 from . import formats
 from . import util
 
-import logging
 log = logging.getLogger(__name__)
 
 

trezor_agent/tests/test_protocol.py

@@ -1,8 +1,8 @@
+import pytest
+
 from .. import protocol
 from .. import formats
 
-import pytest
-
 # pylint: disable=line-too-long
 
 NIST256_KEY = 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEUksojS/qRlTKBKLQO7CBX7a7oqFkysuFn1nJ6gzlR3wNuQXEgd7qb2bjmiiBHsjNxyWvH5SxVi3+fghrqODWo= ssh://localhost'  # nopep8

trezor_agent/tests/test_trezor.py

@@ -1,9 +1,9 @@
-from ..trezor import client
-from .. import formats
-
 import mock
 import pytest
 
+from ..trezor import client
+from .. import formats
+
 
 ADDR = [2147483661, 2810943954, 3938368396, 3454558782, 3848009040]
 CURVE = 'nist256p1'

trezor_agent/trezor/_factory.py

@@ -7,7 +7,7 @@ def client():
     from trezorlib.transport_hid import HidTransport
     from trezorlib.messages_pb2 import PassphraseAck
 
-    devices = HidTransport.enumerate()
+    devices = list(HidTransport.enumerate())
     if len(devices) != 1:
         msg = '{:d} Trezor devices found'.format(len(devices))
         raise IOError(msg)

trezor_agent/trezor/client.py

@@ -2,12 +2,12 @@ import io
 import re
 import struct
 import binascii
+import logging
 
 from .. import util
 from .. import formats
 from . import _factory as TrezorFactory
 
-import logging
 log = logging.getLogger(__name__)