Merge branch 'master' into decode-key-type-in-errors

Author: ojarva

.travis.yml

@@ -1,11 +1,9 @@
 language: python
 python:
-  - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.6-dev"
-  - "3.7-dev"
+  - "3.7"
   - "nightly"
 install:
   - pip install -r requirements.txt

setup.py

@@ -22,7 +22,6 @@
         'Intended Audience :: System Administrators',
         'Topic :: Security',
         'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',

sshpubkeys/exceptions.py

@@ -4,103 +4,83 @@
 
 class InvalidKeyException(Exception):
     """Invalid key - something is wrong with the key, and it should not be accepted, as OpenSSH will not work with it."""
-    pass
 
 
 class InvalidKeyError(InvalidKeyException):
     """Invalid key - something is wrong with the key, and it should not be accepted, as OpenSSH will not work with it."""
-    pass
 
 
 class InvalidKeyLengthException(InvalidKeyError):
     """Invalid key length - either too short or too long.
 
     See also TooShortKeyException and TooLongKeyException."""
-    pass
 
 
 class InvalidKeyLengthError(InvalidKeyError):
     """Invalid key length - either too short or too long.
 
     See also TooShortKeyException and TooLongKeyException."""
-    pass
 
 
 class TooShortKeyException(InvalidKeyLengthError):
     """Key is shorter than what the specification allow."""
-    pass
 
 
 class TooShortKeyError(TooShortKeyException):
     """Key is shorter than what the specification allows."""
-    pass
 
 
 class TooLongKeyException(InvalidKeyLengthError):
     """Key is longer than what the specification allows."""
-    pass
 
 
 class TooLongKeyError(TooLongKeyException):
     """Key is longer than what the specification allows."""
-    pass
 
 
 class InvalidTypeException(InvalidKeyError):
     """Key type is invalid or unrecognized."""
-    pass
 
 
 class InvalidTypeError(InvalidTypeException):
     """Key type is invalid or unrecognized."""
-    pass
 
 
 class MalformedDataException(InvalidKeyError):
     """The key is invalid - unable to parse the data. The data may be corrupted, truncated, or includes extra content that is not allowed."""
-    pass
 
 
 class MalformedDataError(MalformedDataException):
     """The key is invalid - unable to parse the data. The data may be corrupted, truncated, or includes extra content that is not allowed."""
-    pass
 
 
 class InvalidOptionsException(MalformedDataError):
     """Options string is invalid: it contains invalid characters, unrecognized options, or is otherwise malformed."""
-    pass
 
 
 class InvalidOptionsError(InvalidOptionsException):
     """Options string is invalid: it contains invalid characters, unrecognized options, or is otherwise malformed."""
-    pass
 
 
 class InvalidOptionNameException(InvalidOptionsError):
     """Invalid option name (contains disallowed characters, or is unrecognized.)."""
-    pass
 
 
 class InvalidOptionNameError(InvalidOptionNameException):
     """Invalid option name (contains disallowed characters, or is unrecognized.)."""
-    pass
 
 
 class UnknownOptionNameException(InvalidOptionsError):
     """Unrecognized option name."""
-    pass
 
 
 class UnknownOptionNameError(UnknownOptionNameException):
     """Unrecognized option name."""
-    pass
 
 
 class MissingMandatoryOptionValueException(InvalidOptionsError):
     """Mandatory option value is missing."""
-    pass
 
 
 class MissingMandatoryOptionValueError(MissingMandatoryOptionValueException):
     """Mandatory option value is missing."""
-    pass

sshpubkeys/keys.py

@@ -32,7 +32,7 @@
 __all__ = ["AuthorizedKeysFile", "SSHKey"]
 
 
-class AuthorizedKeysFile(object):  # pylint:disable=too-few-public-methods
+class AuthorizedKeysFile:  # pylint:disable=too-few-public-methods
     """Represents a full authorized_keys file.
 
     Comments and empty lines are ignored."""
@@ -53,7 +53,7 @@ def parse(self, file_obj, **kwargs):
             self.keys.append(ssh_key)
 
 
-class SSHKey(object):  # pylint:disable=too-many-instance-attributes
+class SSHKey:  # pylint:disable=too-many-instance-attributes
     """Represents a single SSH keypair.
 
     ssh_key = SSHKey(key_data, strict=True)
@@ -391,14 +391,13 @@ def _process_ed25516(self, data):
     def _process_key(self, data):
         if self.key_type == b"ssh-rsa":
             return self._process_ssh_rsa(data)
-        elif self.key_type == b"ssh-dss":
+        if self.key_type == b"ssh-dss":
             return self._process_ssh_dss(data)
-        elif self.key_type.strip().startswith(b"ecdsa-sha"):
+        if self.key_type.strip().startswith(b"ecdsa-sha"):
             return self._process_ecdsa_sha(data)
-        elif self.key_type == b"ssh-ed25519":
+        if self.key_type == b"ssh-ed25519":
             return self._process_ed25516(data)
-        else:
-            raise NotImplementedError("Invalid key type: %s" % self.key_type.decode())
+        raise NotImplementedError("Invalid key type: %s" % self.key_type.decode())
 
     def parse(self, keydata=None):
         """Validates SSH public key.