From 57eec7fda04034b70681adda53b2d564eed33ef7 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Mar 2016 11:58:32 -0400 Subject: Use runtimeerror for this --- src/cryptography/hazmat/bindings/openssl/binding.py | 3 +-- tests/hazmat/bindings/test_openssl.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py index 73457092..0f7a9d95 100644 --- a/src/cryptography/hazmat/bindings/openssl/binding.py +++ b/src/cryptography/hazmat/bindings/openssl/binding.py @@ -227,8 +227,7 @@ def _verify_openssl_version(version): utils.DeprecatedIn12 ) else: - # TODO: what exception type? - raise Exception( + raise RuntimeError( "You are linking against OpenSSL 0.9.8, which is no longer " "support by the OpenSSL project. You need to upgrade to a " "newer version of OpenSSL." diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index 6b6b7474..34c23ab2 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -178,7 +178,6 @@ class TestOpenSSL(object): def test_verify_openssl_version(self, monkeypatch): monkeypatch.delenv("CRYPTOGRAPHY_ALLOW_OPENSSL_098", raising=False) - # TODO: what exception type? - with pytest.raises(Exception): + with pytest.raises(RuntimeError): # OpenSSL 0.9.8zg _verify_openssl_version(0x9081DF) -- cgit v1.2.3