Merge pull request #76 from ojarva/fix-pylint

Fix pylint warning & formatting

Author: ojarva

.github/workflows/python-tests.yml

@@ -21,9 +21,6 @@ jobs:
         python -m pip install --upgrade pip
         pip install pycodestyle isort pylint yapf
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Check import sorting
-      run: |
-        isort --diff --check --recursive sshpubkeys tests
     - name: Check pycodestyle
       run: |
         pycodestyle --ignore E501,E402 --exclude=.git,dev3 sshpubkeys tests
@@ -35,5 +32,5 @@ jobs:
         python3 setup.py test
     - name: Check formatting
       run: |
-        isort --recursive sshpubkeys tests; yapf --recursive .
+        isort --recursive sshpubkeys tests; yapf --recursive -i .
         git diff --exit-code  # This fails if isort&yapf combo made any changes

sshpubkeys/keys.py

@@ -13,9 +13,10 @@
     sys.exit(1)
 print(ssh_key.bits)"""
 
-from .exceptions import (InvalidKeyError, InvalidKeyLengthError, InvalidOptionNameError, InvalidOptionsError,
-                         InvalidTypeError, MalformedDataError, MissingMandatoryOptionValueError, TooLongKeyError,
-                         TooShortKeyError, UnknownOptionNameError)
+from .exceptions import (
+    InvalidKeyError, InvalidKeyLengthError, InvalidOptionNameError, InvalidOptionsError, InvalidTypeError,
+    MalformedDataError, MissingMandatoryOptionValueError, TooLongKeyError, TooShortKeyError, UnknownOptionNameError
+)
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric.dsa import DSAParameterNumbers, DSAPublicNumbers
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicNumbers
@@ -341,7 +342,9 @@ def _process_ssh_dss(self, data):
             min_length = self.DSA_MIN_LENGTH_LOOSE
             max_length = self.DSA_MAX_LENGTH_LOOSE
         if p_bits < min_length:
-            raise TooShortKeyError("%s key can not be shorter than %s bits (was %s)" % (self.key_type.decode(), min_length, p_bits))
+            raise TooShortKeyError(
+                "%s key can not be shorter than %s bits (was %s)" % (self.key_type.decode(), min_length, p_bits)
+            )
         if p_bits > max_length:
             raise TooLongKeyError(
                 "%s key data can not be longer than %s bits (was %s)" % (self.key_type.decode(), max_length, p_bits)
@@ -396,8 +399,8 @@ def _validate_application_string(self, application):
 
         try:
             parsed_url = urlparse(application)
-        except ValueError as error:
-            raise InvalidKeyError("Application string: %s" % error)
+        except ValueError as err:
+            raise InvalidKeyError(f"Application string: {err}") from err
         if parsed_url.scheme != b"ssh":
             raise InvalidKeyError('Application string must begin with "ssh:"')
 

tests/invalid_keys.py

@@ -1,5 +1,6 @@
-from sshpubkeys.exceptions import (InvalidKeyError, InvalidKeyLengthError, InvalidTypeError, MalformedDataError,
-                                   TooLongKeyError, TooShortKeyError)
+from sshpubkeys.exceptions import (
+    InvalidKeyError, InvalidKeyLengthError, InvalidTypeError, MalformedDataError, TooLongKeyError, TooShortKeyError
+)
 
 keys = [
     [

tests/invalid_options.py

@@ -1,5 +1,6 @@
-from sshpubkeys.exceptions import (InvalidOptionNameError, InvalidOptionsError, MissingMandatoryOptionValueError,
-                                   UnknownOptionNameError)
+from sshpubkeys.exceptions import (
+    InvalidOptionNameError, InvalidOptionsError, MissingMandatoryOptionValueError, UnknownOptionNameError
+)
 
 options = [
     ["includes_space", "no-user-rc ", InvalidOptionsError],