blob: adb12a838972ee16d1992f5cd26db73fc4503b8c (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- contrib/python/urllib3/urllib3/connection.py (index)
+++ contrib/python/urllib3/urllib3/connection.py (working tree)
@@ -349,7 +349,8 @@ class HTTPSConnection(HTTPConnection):
self.key_password = key_password
self.assert_hostname = assert_hostname
self.assert_fingerprint = assert_fingerprint
- self.ca_certs = ca_certs and os.path.expanduser(ca_certs)
+ self.ca_certs = os.path.expanduser(ca_certs) \
+ if isinstance(ca_certs, six.string_types) else ca_certs
self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir)
self.ca_cert_data = ca_cert_data
--- contrib/python/urllib3/urllib3/response.py (index)
+++ contrib/python/urllib3/urllib3/response.py (working tree)
@@ -9,7 +9,8 @@ from socket import timeout as SocketTimeout
try:
import brotli
-except ImportError:
+ brotli.error
+except (ImportError, Exception):
brotli = None
from ._collections import HTTPHeaderDict
|
