|
 |
f5eda6 |
From 86b1fa39fdebdb7bc57131c1a198d4d18e104f95 Mon Sep 17 00:00:00 2001
|
|
|
f5eda6 |
From: Jeremy Cline <jeremy@jcline.org>
|
|
|
f5eda6 |
Date: Mon, 16 Apr 2018 10:35:35 -0400
|
|
|
f5eda6 |
Subject: [PATCH] Don't inject pyopenssl into urllib3
|
|
|
f5eda6 |
|
|
|
f5eda6 |
Fedora ships sufficiently new versions of Python 2 and 3 to make this
|
|
|
f5eda6 |
unnecessary (rhbz 1567862)
|
|
|
f5eda6 |
|
|
|
f5eda6 |
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
|
|
f5eda6 |
---
|
|
|
f5eda6 |
requests/__init__.py | 7 -------
|
|
|
f5eda6 |
1 file changed, 7 deletions(-)
|
|
|
f5eda6 |
|
|
|
f5eda6 |
diff --git a/requests/__init__.py b/requests/__init__.py
|
|
|
f5eda6 |
index a5b3c9c3..e312d314 100644
|
|
|
f5eda6 |
--- a/requests/__init__.py
|
|
|
f5eda6 |
+++ b/requests/__init__.py
|
|
|
f5eda6 |
@@ -90,17 +90,6 @@ except (AssertionError, ValueError):
|
|
|
f5eda6 |
"version!".format(urllib3.__version__, chardet.__version__),
|
|
|
f5eda6 |
RequestsDependencyWarning)
|
|
|
f5eda6 |
|
|
|
f5eda6 |
-# Attempt to enable urllib3's SNI support, if possible
|
|
|
f5eda6 |
-try:
|
|
|
f5eda6 |
- from urllib3.contrib import pyopenssl
|
|
|
f5eda6 |
- pyopenssl.inject_into_urllib3()
|
|
|
f5eda6 |
-
|
|
|
f5eda6 |
- # Check cryptography version
|
|
|
f5eda6 |
- from cryptography import __version__ as cryptography_version
|
|
|
f5eda6 |
- _check_cryptography(cryptography_version)
|
|
|
f5eda6 |
-except ImportError:
|
|
|
f5eda6 |
- pass
|
|
|
f5eda6 |
-
|
|
|
f5eda6 |
# urllib3's DependencyWarnings should be silenced.
|
|
|
f5eda6 |
from urllib3.exceptions import DependencyWarning
|
|
|
f5eda6 |
warnings.simplefilter('ignore', DependencyWarning)
|
|
|
f5eda6 |
--
|
|
|
f5eda6 |
2.17.0
|
|
|
f5eda6 |
|