From 71902fb5c7f17198a34364aa1025a970e4b38fd5 Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Jan 21 2020 11:05:03 +0000 Subject: Apply https://github.com/pysimplesoap/pysimplesoap/pull/170 --- diff --git a/httplib2.patch b/httplib2.patch new file mode 100644 index 0000000..02b5c08 --- /dev/null +++ b/httplib2.patch @@ -0,0 +1,33 @@ +diff -Naur PySimpleSOAP-1.16.2/pysimplesoap/transport.py PySimpleSOAP-1.16.2.fix/pysimplesoap/transport.py +--- PySimpleSOAP-1.16.2/pysimplesoap/transport.py 2017-12-03 20:40:29.000000000 +0530 ++++ PySimpleSOAP-1.16.2.fix/pysimplesoap/transport.py 2020-01-21 16:31:32.124645971 +0530 +@@ -16,6 +16,8 @@ + import logging + import ssl + import sys ++from distutils.version import LooseVersion ++ + try: + import urllib2 + from cookielib import CookieJar +@@ -62,7 +64,7 @@ + # + try: + import httplib2 +- if sys.version > '3' and httplib2.__version__ <= "0.7.7": ++ if sys.version > '3' and LooseVersion(httplib2.__version__) <= LooseVersion("0.7.7"): + import http.client + # httplib2 workaround: check_hostname needs a SSL context with either + # CERT_OPTIONAL or CERT_REQUIRED +@@ -92,9 +94,9 @@ + log.info("using proxy %s" % proxy) + + # set optional parameters according to supported httplib2 version +- if httplib2.__version__ >= '0.3.0': ++ if LooseVersion(httplib2.__version__) >= LooseVersion('0.3.0'): + kwargs['timeout'] = timeout +- if httplib2.__version__ >= '0.7.0': ++ if LooseVersion(httplib2.__version__) >= LooseVersion('0.7.0'): + kwargs['disable_ssl_certificate_validation'] = cacert is None + kwargs['ca_certs'] = cacert + httplib2.Http.__init__(self, **kwargs)