forked from pool/python-httplib2
9e561e42a6
instead (bnc#761162) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=17
46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
Only in a/python2/httplib2: cacerts.txt
|
|
diff -ru a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
|
|
--- a/python2/httplib2/__init__.py 2012-03-02 21:12:34.000000000 +0100
|
|
+++ b/python2/httplib2/__init__.py 2012-06-20 13:30:39.524140796 +0200
|
|
@@ -180,9 +180,8 @@
|
|
# requesting that URI again.
|
|
DEFAULT_MAX_REDIRECTS = 5
|
|
|
|
-# Default CA certificates file bundled with httplib2.
|
|
-CA_CERTS = os.path.join(
|
|
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
|
+# Use system-wide CA certificates:
|
|
+CA_CERTS = '/etc/ssl/ca-bundle.pem'
|
|
|
|
# Which headers are hop-by-hop headers by default
|
|
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
|
Only in b/python2/httplib2: .__init__.py.swp
|
|
Only in a/python3/httplib2: cacerts.txt
|
|
diff -ru a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
|
|
--- a/python3/httplib2/__init__.py 2012-03-02 21:12:34.000000000 +0100
|
|
+++ b/python3/httplib2/__init__.py 2012-06-20 13:30:22.156140376 +0200
|
|
@@ -119,9 +119,8 @@
|
|
# Which headers are hop-by-hop headers by default
|
|
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")
|
|
+# Use system-wide CA certificates:
|
|
+CA_CERTS = '/etc/ssl/ca-bundle.pem'
|
|
|
|
def _get_end2end_headers(response):
|
|
hopbyhop = list(HOP_BY_HOP)
|
|
Only in b/python3/httplib2: .__init__.py.swp
|
|
diff -ru a/setup.py b/setup.py
|
|
--- a/setup.py 2012-03-02 21:12:34.000000000 +0100
|
|
+++ b/setup.py 2012-06-20 13:28:26.560137617 +0200
|
|
@@ -63,7 +63,6 @@
|
|
""",
|
|
package_dir=pkgdir,
|
|
packages=['httplib2'],
|
|
- package_data={'httplib2': ['*.txt']},
|
|
classifiers=[
|
|
'Development Status :: 4 - Beta',
|
|
'Environment :: Web Environment',
|