Robert Schweikert
6364e2e8d9
OpenSSL has everything built in to do the cert verification, we do not need to pass a cert bundle file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=48
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
diff -ruN a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
|
|
--- a/python2/httplib2/__init__.py 2013-03-06 21:45:31.000000000 +0100
|
|
+++ b/python2/httplib2/__init__.py 2013-03-22 14:02:09.458410128 +0100
|
|
@@ -184,15 +184,8 @@
|
|
# requesting that URI again.
|
|
DEFAULT_MAX_REDIRECTS = 5
|
|
|
|
-try:
|
|
- # Users can optionally provide a module that tells us where the CA_CERTS
|
|
- # are located.
|
|
- import ca_certs_locater
|
|
- CA_CERTS = ca_certs_locater.get()
|
|
-except ImportError:
|
|
- # Default CA certificates file bundled with httplib2.
|
|
- CA_CERTS = os.path.join(
|
|
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
|
+# Default CA certificates file bundled with httplib2.
|
|
+CA_CERTS = None
|
|
|
|
# Which headers are hop-by-hop headers by default
|
|
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
|
diff -ruN a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
|
|
--- a/python3/httplib2/__init__.py 2013-03-06 21:45:31.000000000 +0100
|
|
+++ b/python3/httplib2/__init__.py 2013-03-22 14:01:51.270409717 +0100
|
|
@@ -124,8 +124,8 @@
|
|
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
|
|
|
# Default CA certificates file bundled with httplib2.
|
|
-CA_CERTS = os.path.join(
|
|
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
|
+CA_CERTS = '/etc/ssl/ca-bundle.pem'
|
|
+
|
|
|
|
def _get_end2end_headers(response):
|
|
hopbyhop = list(HOP_BY_HOP)
|
|
diff -ruN a/setup.py b/setup.py
|
|
--- a/setup.py 2013-03-06 21:45:31.000000000 +0100
|
|
+++ b/setup.py 2013-03-22 14:02:33.031410660 +0100
|
|
@@ -62,7 +62,6 @@
|
|
""",
|
|
package_dir=pkgdir,
|
|
packages=['httplib2'],
|
|
- package_data={'httplib2': ['*.txt']},
|
|
classifiers=[
|
|
'Development Status :: 4 - Beta',
|
|
'Environment :: Web Environment',
|