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

revert to 37 again

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=40
This commit is contained in:
Sascha Peilicke
2013-07-03 12:43:31 +00:00
committed by Git OBS Bridge
parent 579330f9b9
commit cbe6341ca8
6 changed files with 54 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
httplib2-use-system-certs.patch Normal file
View File

@@ -0,0 +1,46 @@
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 = '/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']
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',