From ab6892f42f33de5933727ff66d69c898df9c15d4 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <me@romanzey.de>
Date: Thu, 26 Sep 2019 08:55:10 +0300
Subject: [PATCH] Fix pylint warnings

---
 .pylintrc                | 2 +-
 libagent/gpg/keyring.py  | 4 +---
 libagent/ssh/__init__.py | 3 +--
 libagent/util.py         | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 8ad44ac..33809a1 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,5 +1,5 @@
 [MESSAGES CONTROL]
-disable=invalid-name, missing-docstring, locally-disabled, unbalanced-tuple-unpacking,no-else-return,fixme,duplicate-code,cyclic-import
+disable=invalid-name, missing-docstring, locally-disabled, unbalanced-tuple-unpacking,no-else-return,fixme,duplicate-code,cyclic-import,import-outside-toplevel
 
 [SIMILARITIES]
 min-similarity-lines=5
diff --git a/libagent/gpg/keyring.py b/libagent/gpg/keyring.py
index 464395d..bb11a15 100644
--- a/libagent/gpg/keyring.py
+++ b/libagent/gpg/keyring.py
@@ -173,9 +173,7 @@ def sign_digest(sock, keygrip, digest, sp=subprocess, environ=None):
     assert communicate(sock, 'PKSIGN') == b'OK'
     while True:
         line = recvline(sock).strip()
-        if line.startswith(b'S PROGRESS'):
-            continue
-        else:
+        if not line.startswith(b'S PROGRESS'):
             break
     line = unescape(line)
     log.debug('unescaped: %r', line)
diff --git a/libagent/ssh/__init__.py b/libagent/ssh/__init__.py
index c73f78d..1933720 100644
--- a/libagent/ssh/__init__.py
+++ b/libagent/ssh/__init__.py
@@ -78,8 +78,7 @@ def create_agent_parser(device_type):
     p.add_argument('--version', help='print the version info',
                    action='version', version=versions)
 
-    curve_names = [name for name in formats.SUPPORTED_CURVES]
-    curve_names = ', '.join(sorted(curve_names))
+    curve_names = ', '.join(sorted(formats.SUPPORTED_CURVES))
     p.add_argument('-e', '--ecdsa-curve-name', metavar='CURVE',
                    default=formats.CURVE_NIST256,
                    help='specify ECDSA curve name: ' + curve_names)
diff --git a/libagent/util.py b/libagent/util.py
index 0300903..df8c38a 100644
--- a/libagent/util.py
+++ b/libagent/util.py
@@ -242,7 +242,7 @@ def which(cmd):
         from shutil import which as _which
     except ImportError:
         # For Python 2
-        from backports.shutil_which import which as _which  # pylint: disable=relative-import
+        from backports.shutil_which import which as _which
     full_path = _which(cmd)
     if full_path is None:
         raise OSError('Cannot find {!r} in $PATH'.format(cmd))