From ee4b1fcdb676739fb6d99cc5028d95963870598b Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 16 Oct 2021 22:01:00 +0300 Subject: [PATCH] Multiple style fixes --- .pylintrc | 3 +-- libagent/device/interface.py | 2 +- libagent/formats.py | 2 +- libagent/gpg/__init__.py | 1 + libagent/gpg/keyring.py | 2 +- libagent/ssh/__init__.py | 2 +- libagent/tests/test_interface.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pylintrc b/.pylintrc index 1a26ad7..3612274 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,5 +1,4 @@ [MESSAGES CONTROL] -disable=invalid-name, missing-docstring, locally-disabled, unbalanced-tuple-unpacking,no-else-return,fixme,duplicate-code,cyclic-import,import-outside-toplevel,consider-using-with - +disable=invalid-name, missing-docstring, locally-disabled, unbalanced-tuple-unpacking,no-else-return,fixme,duplicate-code,cyclic-import,import-outside-toplevel,consider-using-with,consider-using-f-string,unspecified-encoding [SIMILARITIES] min-similarity-lines=5 diff --git a/libagent/device/interface.py b/libagent/device/interface.py index 8d83d3b..a21aad7 100644 --- a/libagent/device/interface.py +++ b/libagent/device/interface.py @@ -79,7 +79,7 @@ class Identity: def to_string(self): """Return identity serialized to string.""" - return u'<{}|{}>'.format(identity_to_string(self.identity_dict), self.curve_name) + return '<{}|{}>'.format(identity_to_string(self.identity_dict), self.curve_name) def get_bip32_address(self, ecdh=False): """Compute BIP32 derivation address according to SLIP-0013/0017.""" diff --git a/libagent/formats.py b/libagent/formats.py index 5189c75..9d64424 100644 --- a/libagent/formats.py +++ b/libagent/formats.py @@ -190,7 +190,7 @@ def export_public_key(vk, label): key_type, blob = serialize_verifying_key(vk) log.debug('fingerprint: %s', fingerprint(blob)) b64 = base64.b64encode(blob).decode('ascii') - return u'{} {} {}\n'.format(key_type.decode('ascii'), b64, label) + return '{} {} {}\n'.format(key_type.decode('ascii'), b64, label) def import_public_key(line): diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py index edb7cda..5ed6af9 100644 --- a/libagent/gpg/__init__.py +++ b/libagent/gpg/__init__.py @@ -18,6 +18,7 @@ import subprocess import sys import time +import daemon import pkg_resources import semver diff --git a/libagent/gpg/keyring.py b/libagent/gpg/keyring.py index bb11a15..736ab5c 100644 --- a/libagent/gpg/keyring.py +++ b/libagent/gpg/keyring.py @@ -222,7 +222,7 @@ def gpg_version(sp=subprocess): """Get a keygrip of the primary GPG key of the specified user.""" args = gpg_command(['--version']) output = check_output(args=args, sp=sp) - line = output.split(b'\n')[0] # b'gpg (GnuPG) 2.1.11' + line = output.split(b'\n', maxsplit=1)[0] # b'gpg (GnuPG) 2.1.11' line = line.split(b' ')[-1] # b'2.1.11' line = line.split(b'-')[0] # remove trailing version parts return line.split(b'v')[-1] # remove 'v' prefix diff --git a/libagent/ssh/__init__.py b/libagent/ssh/__init__.py index 614404d..af31ab5 100644 --- a/libagent/ssh/__init__.py +++ b/libagent/ssh/__init__.py @@ -269,7 +269,7 @@ def main(device_type): identities = [device.interface.Identity( identity_str=args.identity, curve_name=args.ecdsa_curve_name)] for index, identity in enumerate(identities): - identity.identity_dict['proto'] = u'ssh' + identity.identity_dict['proto'] = 'ssh' log.info('identity #%d: %s', index, identity.to_string()) # override default PIN/passphrase entry tools (relevant for TREZOR/Keepkey): diff --git a/libagent/tests/test_interface.py b/libagent/tests/test_interface.py index 41113c2..5df6ee0 100644 --- a/libagent/tests/test_interface.py +++ b/libagent/tests/test_interface.py @@ -2,6 +2,6 @@ from ..device import interface def test_unicode(): - i = interface.Identity(u'ko\u017eu\u0161\u010dek@host', 'ed25519') + i = interface.Identity('ko\u017eu\u0161\u010dek@host', 'ed25519') assert i.to_bytes() == b'kozuscek@host' assert sorted(i.items()) == [('host', 'host'), ('user', 'kozuscek')]