|
 |
19d8690 |
From 94a8758ca124e7d04c208eed7713a45ad5d74332 Mon Sep 17 00:00:00 2001
|
|
|
19d8690 |
From: Haikel Guemar <hguemar@fedoraproject.org>
|
|
|
19d8690 |
Date: Wed, 4 Oct 2017 19:22:58 +0200
|
|
|
19d8690 |
Subject: [PATCH 2/2] Drop OpenSSL.rand support
|
|
|
19d8690 |
|
|
|
19d8690 |
PyOpenSSL deprecated OpenSSL.rand in 17.2.0 and removed it in 17.3.0.
|
|
|
19d8690 |
To comply, update min version in tests to 17.3.0 and removes it.
|
|
|
19d8690 |
https://pyopenssl.org/en/stable/changelog.html
|
|
|
19d8690 |
|
|
|
19d8690 |
(cherry picked from commit 5b8f5f595624bdfb5f707707959977bb56864e0d)
|
|
|
19d8690 |
---
|
|
|
19d8690 |
eventlet/green/OpenSSL/__init__.py | 1 -
|
|
|
19d8690 |
eventlet/green/OpenSSL/rand.py | 1 -
|
|
|
19d8690 |
tests/openssl_test.py | 1 -
|
|
|
19d8690 |
3 files changed, 3 deletions(-)
|
|
|
19d8690 |
delete mode 100644 eventlet/green/OpenSSL/rand.py
|
|
|
19d8690 |
|
|
|
19d8690 |
diff --git a/eventlet/green/OpenSSL/__init__.py b/eventlet/green/OpenSSL/__init__.py
|
|
|
19d8690 |
index 26b60d9..d861476 100644
|
|
|
19d8690 |
--- a/eventlet/green/OpenSSL/__init__.py
|
|
|
19d8690 |
+++ b/eventlet/green/OpenSSL/__init__.py
|
|
|
19d8690 |
@@ -1,4 +1,3 @@
|
|
|
19d8690 |
-from . import rand
|
|
|
19d8690 |
from . import crypto
|
|
|
19d8690 |
from . import SSL
|
|
|
19d8690 |
from . import tsafe
|
|
|
19d8690 |
diff --git a/eventlet/green/OpenSSL/rand.py b/eventlet/green/OpenSSL/rand.py
|
|
|
19d8690 |
deleted file mode 100644
|
|
|
19d8690 |
index c670f73..0000000
|
|
|
19d8690 |
--- a/eventlet/green/OpenSSL/rand.py
|
|
|
19d8690 |
+++ /dev/null
|
|
|
19d8690 |
@@ -1 +0,0 @@
|
|
|
19d8690 |
-from OpenSSL.rand import *
|
|
|
19d8690 |
diff --git a/tests/openssl_test.py b/tests/openssl_test.py
|
|
|
19d8690 |
index a4498dc..a127408 100644
|
|
|
19d8690 |
--- a/tests/openssl_test.py
|
|
|
19d8690 |
+++ b/tests/openssl_test.py
|
|
|
19d8690 |
@@ -12,6 +12,5 @@ def test_import():
|
|
|
19d8690 |
|
|
|
19d8690 |
import eventlet.green.OpenSSL.SSL
|
|
|
19d8690 |
import eventlet.green.OpenSSL.crypto
|
|
|
19d8690 |
- import eventlet.green.OpenSSL.rand
|
|
|
19d8690 |
import eventlet.green.OpenSSL.tsafe
|
|
|
19d8690 |
import eventlet.green.OpenSSL.version
|
|
|
19d8690 |
--
|
|
|
19d8690 |
2.13.5
|
|
|
19d8690 |
|