Update to the latest upstream.
This commit is contained in:
parent
3b31b2adab
commit
9c75512083
5 changed files with 61 additions and 53 deletions
|
|
@ -1,44 +1,37 @@
|
|||
From 415619361cc23dd87b1a7a5fd0cfba38e33d24fd Mon Sep 17 00:00:00 2001
|
||||
From 6ca0a139fa69545fc22b611485a39e281a07798b Mon Sep 17 00:00:00 2001
|
||||
From: Ralph Bean <rbean@redhat.com>
|
||||
Date: Wed, 27 Feb 2013 09:16:20 -0500
|
||||
Subject: [PATCH] system cert bundle
|
||||
Date: Mon, 1 Jul 2013 14:50:34 -0400
|
||||
Subject: [PATCH 1/3] system cert bundle
|
||||
|
||||
---
|
||||
requests/certs.py | 17 +++++------------
|
||||
1 file changed, 5 insertions(+), 12 deletions(-)
|
||||
requests/certs.py | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/requests/certs.py b/requests/certs.py
|
||||
index 8148276..6e07f5e 100644
|
||||
index bc00826..9b78e3b 100644
|
||||
--- a/requests/certs.py
|
||||
+++ b/requests/certs.py
|
||||
@@ -10,22 +10,15 @@ This module returns the preferred default CA certificate bundle.
|
||||
@@ -10,15 +10,15 @@ This module returns the preferred default CA certificate bundle.
|
||||
If you are packaging Requests, e.g., for a Linux distribution or a managed
|
||||
environment, you can change the definition of where() to return a separately
|
||||
packaged CA bundle.
|
||||
-"""
|
||||
-
|
||||
-import os.path
|
||||
|
||||
-certifi = None
|
||||
-try:
|
||||
- import certifi
|
||||
-except ImportError:
|
||||
- pass
|
||||
-import os.path
|
||||
+We return "/etc/pki/tls/certs/ca-bundle.crt" provided by the ca-certificates
|
||||
+package.
|
||||
+"""
|
||||
|
||||
|
||||
def where():
|
||||
"""Return the preferred certificate bundle."""
|
||||
- if certifi:
|
||||
- return certifi.where()
|
||||
-
|
||||
- """Return the preferred certificate bundle."""
|
||||
- # vendored bundle inside Requests
|
||||
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
|
||||
+ # Don't use the certs bundled with requests, use ca-certificates'.
|
||||
+ """ Don't use the certs bundled with requests, use ca-certificates. """
|
||||
+ return "/etc/pki/tls/certs/ca-bundle.crt"
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(where())
|
||||
--
|
||||
1.8.1.2
|
||||
1.8.1.4
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue