|
 |
71902fb |
diff -Naur PySimpleSOAP-1.16.2/pysimplesoap/transport.py PySimpleSOAP-1.16.2.fix/pysimplesoap/transport.py
|
|
|
71902fb |
--- PySimpleSOAP-1.16.2/pysimplesoap/transport.py 2017-12-03 20:40:29.000000000 +0530
|
|
|
71902fb |
+++ PySimpleSOAP-1.16.2.fix/pysimplesoap/transport.py 2020-01-21 16:31:32.124645971 +0530
|
|
|
71902fb |
@@ -16,6 +16,8 @@
|
|
|
71902fb |
import logging
|
|
|
71902fb |
import ssl
|
|
|
71902fb |
import sys
|
|
|
71902fb |
+from distutils.version import LooseVersion
|
|
|
71902fb |
+
|
|
|
71902fb |
try:
|
|
|
71902fb |
import urllib2
|
|
|
71902fb |
from cookielib import CookieJar
|
|
|
71902fb |
@@ -62,7 +64,7 @@
|
|
|
71902fb |
#
|
|
|
71902fb |
try:
|
|
|
71902fb |
import httplib2
|
|
|
71902fb |
- if sys.version > '3' and httplib2.__version__ <= "0.7.7":
|
|
|
71902fb |
+ if sys.version > '3' and LooseVersion(httplib2.__version__) <= LooseVersion("0.7.7"):
|
|
|
71902fb |
import http.client
|
|
|
71902fb |
# httplib2 workaround: check_hostname needs a SSL context with either
|
|
|
71902fb |
# CERT_OPTIONAL or CERT_REQUIRED
|
|
|
71902fb |
@@ -92,9 +94,9 @@
|
|
|
71902fb |
log.info("using proxy %s" % proxy)
|
|
|
71902fb |
|
|
|
71902fb |
# set optional parameters according to supported httplib2 version
|
|
|
71902fb |
- if httplib2.__version__ >= '0.3.0':
|
|
|
71902fb |
+ if LooseVersion(httplib2.__version__) >= LooseVersion('0.3.0'):
|
|
|
71902fb |
kwargs['timeout'] = timeout
|
|
|
71902fb |
- if httplib2.__version__ >= '0.7.0':
|
|
|
71902fb |
+ if LooseVersion(httplib2.__version__) >= LooseVersion('0.7.0'):
|
|
|
71902fb |
kwargs['disable_ssl_certificate_validation'] = cacert is None
|
|
|
71902fb |
kwargs['ca_certs'] = cacert
|
|
|
71902fb |
httplib2.Http.__init__(self, **kwargs)
|