summaryrefslogtreecommitdiff
path: root/OpenSSL/test/test_ssl.py
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2012-03-10 18:03:47 -0800
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2012-03-10 18:03:47 -0800
commit0beed1c968ea4511cbe8515effed7acd2a715b48 (patch)
tree03157648605d43b961e50c4a398f27db7958c48e /OpenSSL/test/test_ssl.py
parentbc2c186728161ceff19e7fd6db1dfab907c723a4 (diff)
parent4cc06a7ab794aa55f4a55a5757adebadd9151fc3 (diff)
downloadpyopenssl-0beed1c968ea4511cbe8515effed7acd2a715b48.tar.gz
Fix a variety of crashes on PyPy or on various builds of OpenSSL
Diffstat (limited to 'OpenSSL/test/test_ssl.py')
-rw-r--r--OpenSSL/test/test_ssl.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
index 721c1c0..3e4e3da 100644
--- a/OpenSSL/test/test_ssl.py
+++ b/OpenSSL/test/test_ssl.py
@@ -313,7 +313,7 @@ class ContextTests(TestCase, _LoopbackMixin):
try:
Context(SSLv2_METHOD)
- except ValueError:
+ except (Error, ValueError):
# Some versions of OpenSSL have SSLv2, some don't.
# Difficult to say in advance.
pass