rpm/python-httplib2
SHA256
1
0
Fork 0
forked from pool/python-httplib2
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=71

Browse Source
This commit is contained in:
Dirk Mueller 2018-01-10 07:47:00 +00:00 committed by Git OBS Bridge
parent a21a4af214
commit a526ed3d3e
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
httplib2-use-system-certs.patch
View File

@ -2,9 +2,13 @@ Index: httplib2-0.10.3/python2/httplib2/__init__.py
===================================================================
--- httplib2-0.10.3.orig/python2/httplib2/__init__.py
+++ httplib2-0.10.3/python2/httplib2/__init__.py
@@ -87,7 +87,17 @@ def _ssl_wrap_socket(sock, key_file, cer
ssl_version = ssl.PROTOCOL_SSLv23
@@ -83,11 +83,18 @@ def _ssl_wrap_socket(sock, key_file, cer
cert_reqs = ssl.CERT_NONE
else:
cert_reqs = ssl.CERT_REQUIRED
- if ssl_version is None:
- ssl_version = ssl.PROTOCOL_SSLv23
-
if hasattr(ssl, 'SSLContext'): # Python 2.7.9
- context = ssl.SSLContext(ssl_version)
+ cafile = ca_certs
@ -21,6 +25,16 @@ Index: httplib2-0.10.3/python2/httplib2/__init__.py
context.verify_mode = cert_reqs
context.check_hostname = (cert_reqs != ssl.CERT_NONE)
if cert_file:
@@ -96,6 +103,9 @@ def _ssl_wrap_socket(sock, key_file, cer
context.load_verify_locations(ca_certs)
return context.wrap_socket(sock, server_hostname=hostname)
else:
+ if ssl_version is None:
+ ssl_version = ssl.PROTOCOL_SSLv23
+
return ssl.wrap_socket(sock, keyfile=key_file, certfile=cert_file,
cert_reqs=cert_reqs, ca_certs=ca_certs,
ssl_version=ssl_version)
@@ -210,15 +220,8 @@ class NotRunningAppEngineEnvironment(Htt
# requesting that URI again.
DEFAULT_MAX_REDIRECTS = 5