Dirk Mueller
154c4f7af4
update to version v2.12.4 * Python 2 compatibility * adding tests for super_len conditional flow * Check in updated idna. * Test case for requests getting stuck on post redirect with seekable stream * v2.12.2 * added new test, original test restored * Make Response.content return None if raw is None * adding unicode_is_ascii utility function * Update sidebarlogo.html * Fixed another scheme proxy over "all" priority * Add changelog for 1.19.1 * changed behavior of basic-http-auth test * correct backtick formatting * Note @jeremycline is now our contact. * Order of type check * Add prepared request pickling tests * adding comment * Add deprecation warnings for 3.0 * clarify that the `chunk_size` is optional when streaming to a file * adding ISO-8859-1 fallback for reason decoding * fixed some error * pysocks 1.5.7 blacklisting, due to IPv6 problems * Fix tests for new urllib3 exception text. * make add_dict_to_cookiejar cookielib.CookieJar compatible * correct module for cookiejar_from_dict in docs * converting update call to merge_cookies call for cookielib compatibility * streaming doc clarification * removing redundant logic from prepare_content_length * Update certifi certs to 2016.09.26 OBS-URL: https://build.opensuse.org/request/show/447958 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=94
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
Index: requests-2.12.4/MANIFEST.in
|
|
===================================================================
|
|
--- requests-2.12.4.orig/MANIFEST.in
|
|
+++ requests-2.12.4/MANIFEST.in
|
|
@@ -1 +1 @@
|
|
-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem
|
|
+include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt
|
|
Index: requests-2.12.4/requests/adapters.py
|
|
===================================================================
|
|
--- requests-2.12.4.orig/requests/adapters.py
|
|
+++ requests-2.12.4/requests/adapters.py
|
|
@@ -213,15 +213,13 @@ class HTTPAdapter(BaseAdapter):
|
|
if verify is not True:
|
|
cert_loc = verify
|
|
|
|
- if not cert_loc:
|
|
- cert_loc = DEFAULT_CA_BUNDLE_PATH
|
|
-
|
|
- if not cert_loc:
|
|
- raise Exception("Could not find a suitable SSL CA certificate bundle.")
|
|
-
|
|
conn.cert_reqs = 'CERT_REQUIRED'
|
|
|
|
- if not os.path.isdir(cert_loc):
|
|
+ if cert_loc is None:
|
|
+ # use default context
|
|
+ conn.ca_certs = None
|
|
+ conn.ca_cert_dir = None
|
|
+ elif not os.path.isdir(cert_loc):
|
|
conn.ca_certs = cert_loc
|
|
else:
|
|
conn.ca_cert_dir = cert_loc
|
|
Index: requests-2.12.4/requests/certs.py
|
|
===================================================================
|
|
--- requests-2.12.4.orig/requests/certs.py
|
|
+++ requests-2.12.4/requests/certs.py
|
|
@@ -18,8 +18,9 @@ try:
|
|
except ImportError:
|
|
def where():
|
|
"""Return the preferred certificate bundle."""
|
|
- # vendored bundle inside Requests
|
|
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
|
|
+ # in openSUSE we rely on ca-certificates instead of
|
|
+ # having an another bundle
|
|
+ return '/etc/ssl/ca-bundle.pem'
|
|
|
|
if __name__ == '__main__':
|
|
print(where())
|