diff options
| author | Sergey Shepelev <temotor@gmail.com> | 2020-12-02 01:10:02 +0300 |
|---|---|---|
| committer | Sergey Shepelev <temotor@gmail.com> | 2020-12-02 01:14:27 +0300 |
| commit | be0d520c9bc9e3b3959f84d80c65e418e6081887 (patch) | |
| tree | 82ae1550d9b6c573a988cd2258c41cb24b4a148f | |
| parent | a745d62a932d7776fb9431a6fa74171c41d23450 (diff) | |
| download | eventlet-671-openssl-tsafe.tar.gz | |
pyopenssl tsafe module was deprecated and removed in v20.0.0671-openssl-tsafe
https://github.com/eventlet/eventlet/issues/671
https://github.com/pyca/pyopenssl/pull/913
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | eventlet/green/OpenSSL/__init__.py | 7 | ||||
| -rw-r--r-- | tests/openssl_test.py | 1 | ||||
| -rw-r--r-- | tox.ini | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 163faa7..2c9bc22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ jobs: - {python: pypy, env: TOXENV=pypy-selects} - {python: 3.6, env: TOXENV=ipv6} + - {python: 3.8, env: TOXENV=py38-openssl} allow_failures: - python: 3.7-dev - python: pypy diff --git a/eventlet/green/OpenSSL/__init__.py b/eventlet/green/OpenSSL/__init__.py index d861476..1b25009 100644 --- a/eventlet/green/OpenSSL/__init__.py +++ b/eventlet/green/OpenSSL/__init__.py @@ -1,4 +1,9 @@ from . import crypto from . import SSL -from . import tsafe +try: + # pyopenssl tsafe module was deprecated and removed in v20.0.0 + # https://github.com/pyca/pyopenssl/pull/913 + from . import tsafe +except ImportError: + pass from .version import __version__ diff --git a/tests/openssl_test.py b/tests/openssl_test.py index a127408..1108ada 100644 --- a/tests/openssl_test.py +++ b/tests/openssl_test.py @@ -12,5 +12,4 @@ def test_import(): import eventlet.green.OpenSSL.SSL import eventlet.green.OpenSSL.crypto - import eventlet.green.OpenSSL.tsafe import eventlet.green.OpenSSL.version @@ -16,7 +16,7 @@ statistics = 1 [tox] minversion=2.5 envlist = - ipv6, pep8, py{27,35,36,37,38,py}-{selects,poll,epolls} + ipv6, pep8, py{27,35,36,37,38,py}-{selects,poll,epolls}, py38-openssl [testenv:ipv6] basepython = python @@ -65,6 +65,7 @@ deps = pypy: psycopg2cffi-compat==1.1 py{27,35,36,37}: psycopg2-binary==2.7.4 py38: psycopg2-binary==2.8.4 + py38-openssl: pyopenssl==20.0.0 py27-{selects,poll,epolls}: pyopenssl==17.3.0 setuptools==38.5.1 {selects,poll,epolls}: pyzmq==17.0.0 |