fix more pylint issues

libagent/gpg/keyring.py

@@ -111,8 +111,8 @@ def parse(s):
             value, s = parse(s)
             values.append(value)
         return values, s[1:]
-    else:
-        return parse_term(s)
+
+    return parse_term(s)
 
 
 def _parse_ecdsa_sig(args):

libagent/ssh/__init__.py

@@ -10,8 +10,8 @@ import sys
 import tempfile
 import threading
 
-import configargparse
 import pkg_resources
+import configargparse
 
 from .. import device, formats, server, util
 from . import client, protocol