Don’t inherit from object (#1084)

In python3 all classes inherit by default from object

Author: lovetox

src/OpenSSL/SSL.py

@@ -293,7 +293,7 @@ class SysCallError(Error):
     pass
 
 
-class _CallbackExceptionHelper(object):
+class _CallbackExceptionHelper:
     """
     A base class for wrapper classes that allow for intelligent exception
     handling in OpenSSL callbacks.
@@ -657,7 +657,7 @@ def explode(*args, **kwargs):
 )
 
 
-class Session(object):
+class Session:
     """
     A class representing an SSL session.  A session defines certain connection
     parameters which may be re-used to speed up the setup of subsequent
@@ -669,7 +669,7 @@ class Session(object):
     pass
 
 
-class Context(object):
+class Context:
     """
     :class:`OpenSSL.SSL.Context` instances define the parameters for setting
     up new SSL connections.
@@ -1588,7 +1588,7 @@ def set_cookie_verify_callback(self, callback):
         )
 
 
-class Connection(object):
+class Connection:
     _reverse_mapping = WeakValueDictionary()
 
     def __init__(self, context, socket=None):

src/OpenSSL/crypto.py

@@ -200,7 +200,7 @@ def _get_asn1_time(timestamp):
             return string_result
 
 
-class _X509NameInvalidator(object):
+class _X509NameInvalidator:
     def __init__(self):
         self._names = []
 
@@ -213,7 +213,7 @@ def clear(self):
             del name._name
 
 
-class PKey(object):
+class PKey:
     """
     A class representing an DSA or RSA public key or key pair.
     """
@@ -392,7 +392,7 @@ def bits(self):
         return _lib.EVP_PKEY_bits(self._pkey)
 
 
-class _EllipticCurve(object):
+class _EllipticCurve:
     """
     A representation of a supported elliptic curve.
 
@@ -528,7 +528,7 @@ def get_elliptic_curve(name):
     raise ValueError("unknown curve name", name)
 
 
-class X509Name(object):
+class X509Name:
     """
     An X.509 Distinguished Name.
 
@@ -728,7 +728,7 @@ def get_components(self):
         return result
 
 
-class X509Extension(object):
+class X509Extension:
     """
     An X.509 v3 certificate extension.
     """
@@ -880,7 +880,7 @@ def get_data(self):
         return _ffi.buffer(char_result, result_length)[:]
 
 
-class X509Req(object):
+class X509Req:
     """
     An X.509 certificate signing requests.
     """
@@ -1092,7 +1092,7 @@ def verify(self, pkey):
         return result
 
 
-class X509(object):
+class X509:
     """
     An X.509 certificate.
     """
@@ -1566,7 +1566,7 @@ def get_extension(self, index):
         return ext
 
 
-class X509StoreFlags(object):
+class X509StoreFlags:
     """
     Flags for X509 verification, used to change the behavior of
     :class:`X509Store`.
@@ -1589,7 +1589,7 @@ class X509StoreFlags(object):
     CHECK_SS_SIGNATURE = _lib.X509_V_FLAG_CHECK_SS_SIGNATURE
 
 
-class X509Store(object):
+class X509Store:
     """
     An X.509 store.
 
@@ -1755,7 +1755,7 @@ def __init__(self, message, certificate):
         self.certificate = certificate
 
 
-class X509StoreContext(object):
+class X509StoreContext:
     """
     An X.509 store context.
 
@@ -2080,7 +2080,7 @@ def dump_privatekey(type, pkey, cipher=None, passphrase=None):
     return _bio_to_string(bio)
 
 
-class Revoked(object):
+class Revoked:
     """
     A certificate revocation.
     """
@@ -2253,7 +2253,7 @@ def get_rev_date(self):
         return _get_asn1_time(dt)
 
 
-class CRL(object):
+class CRL:
     """
     A certificate revocation list.
     """
@@ -2475,7 +2475,7 @@ def export(
         return dump_crl(type, self)
 
 
-class PKCS7(object):
+class PKCS7:
     def type_is_signed(self):
         """
         Check if this NID_pkcs7_signed object
@@ -2519,7 +2519,7 @@ def get_type_name(self):
         return _ffi.string(string_type)
 
 
-class PKCS12(object):
+class PKCS12:
     """
     A PKCS #12 archive.
     """
@@ -2700,7 +2700,7 @@ def export(self, passphrase=None, iter=2048, maciter=1):
         return _bio_to_string(bio)
 
 
-class NetscapeSPKI(object):
+class NetscapeSPKI:
     """
     A Netscape SPKI object.
     """
@@ -2790,7 +2790,7 @@ def set_pubkey(self, pkey):
         _openssl_assert(set_result == 1)
 
 
-class _PassphraseHelper(object):
+class _PassphraseHelper:
     def __init__(self, type, passphrase, more_args=False, truncate=False):
         if type != FILETYPE_PEM and passphrase is not None:
             raise ValueError(

tests/test_crypto.py

@@ -809,7 +809,7 @@ def x509_data():
     yield pkey, x509
 
 
-class TestX509Ext(object):
+class TestX509Ext:
     """
     Tests for `OpenSSL.crypto.X509Extension`.
     """
@@ -1008,7 +1008,7 @@ def test_invalid_issuer(self, bad_obj):
             )
 
 
-class TestPKey(object):
+class TestPKey:
     """
     Tests for `OpenSSL.crypto.PKey`.
     """
@@ -1222,7 +1222,7 @@ def key(attr):
     return name
 
 
-class TestX509Name(object):
+class TestX509Name:
     """
     Unit tests for `OpenSSL.crypto.X509Name`.
     """
@@ -2224,7 +2224,7 @@ def test_convert_to_cryptography_key(self):
         assert crypto_cert.version.value == cert.get_version()
 
 
-class TestX509Store(object):
+class TestX509Store:
     """
     Test for `OpenSSL.crypto.X509Store`.
     """
@@ -2295,7 +2295,7 @@ def test_add_cert_accepts_duplicate(self):
     def test_load_locations_parameters(
         self, cafile, capath, call_cafile, call_capath, monkeypatch
     ):
-        class LibMock(object):
+        class LibMock:
             def load_locations(self, store, cafile, capath):
                 self.cafile = cafile
                 self.capath = capath
@@ -2326,7 +2326,7 @@ def test_load_locations_raises_error_on_failure(self, tmpdir):
             store.load_locations(cafile=str(invalid_ca_file))
 
 
-class TestPKCS12(object):
+class TestPKCS12:
     """
     Test for `OpenSSL.crypto.PKCS12` and `OpenSSL.crypto.load_pkcs12`.
     """
@@ -2802,7 +2802,7 @@ def _runopenssl(pem, *args):
     return output
 
 
-class TestLoadPublicKey(object):
+class TestLoadPublicKey:
     """
     Tests for :func:`load_publickey`.
     """
@@ -2842,7 +2842,7 @@ def test_tolerates_unicode_strings(self):
         assert dumped_pem == cleartextPublicKeyPEM
 
 
-class TestFunction(object):
+class TestFunction:
     """
     Tests for free-functions in the `OpenSSL.crypto` module.
     """
@@ -3263,7 +3263,7 @@ def test_load_pkcs7_type_invalid(self):
             load_pkcs7_data(object(), b"foo")
 
 
-class TestLoadCertificate(object):
+class TestLoadCertificate:
     """
     Tests for `load_certificate_request`.
     """
@@ -3287,7 +3287,7 @@ def test_bad_certificate(self):
             load_certificate(FILETYPE_ASN1, b"lol")
 
 
-class TestPKCS7(object):
+class TestPKCS7:
     """
     Tests for `PKCS7`.
     """
@@ -3387,7 +3387,7 @@ def test_b64_encode(self):
         assert isinstance(blob, bytes)
 
 
-class TestRevoked(object):
+class TestRevoked:
     """
     Tests for `OpenSSL.crypto.Revoked`.
     """
@@ -3497,7 +3497,7 @@ def test_set_reason_invalid_reason(self):
             revoked.set_reason(b"blue")
 
 
-class TestCRL(object):
+class TestCRL:
     """
     Tests for `OpenSSL.crypto.CRL`.
     """
@@ -3858,7 +3858,7 @@ def test_convert_to_cryptography_key(self):
         assert isinstance(crypto_crl, x509.CertificateRevocationList)
 
 
-class TestX509StoreContext(object):
+class TestX509StoreContext:
     """
     Tests for `OpenSSL.crypto.X509StoreContext`.
     """
@@ -4226,7 +4226,7 @@ def test_verify_failure_with_empty_ca_directory(self, tmpdir):
         assert exc.value.args[0][2] == "unable to get local issuer certificate"
 
 
-class TestSignVerify(object):
+class TestSignVerify:
     """
     Tests for `OpenSSL.crypto.sign` and `OpenSSL.crypto.verify`.
     """
@@ -4348,7 +4348,7 @@ def test_sign_with_large_key(self):
         sign(priv_key, content, "sha256")
 
 
-class TestEllipticCurve(object):
+class TestEllipticCurve:
     """
     Tests for `_EllipticCurve`, `get_elliptic_curve`, and
     `get_elliptic_curves`.
@@ -4399,7 +4399,7 @@ def test_to_EC_KEY(self):
         curve._to_EC_KEY()
 
 
-class EllipticCurveFactory(object):
+class EllipticCurveFactory:
     """
     A helper to get the names of two curves.
     """
@@ -4434,7 +4434,7 @@ def anotherInstance(self):
         return get_elliptic_curve(self.curve_factory.another_curve_name)
 
 
-class TestEllipticCurveHash(object):
+class TestEllipticCurveHash:
     """
     Tests for `_EllipticCurve`'s implementation of hashing (thus use as
     an item in a `dict` or `set`).

tests/test_rand.py

@@ -10,7 +10,7 @@
 from OpenSSL import rand
 
 
-class TestRand(object):
+class TestRand:
     @pytest.mark.parametrize("args", [(b"foo", None), (None, 3)])
     def test_add_wrong_args(self, args):
         """