From dc3593334770d8bae4b486f4838eb1b090a03349 Mon Sep 17 00:00:00 2001 From: AndTheDaysGoBy Date: Fri, 11 Jan 2019 16:28:31 -0600 Subject: [PATCH 1/3] Use default cacert Uses the default cacert (e.g. set via s = requests.Sessions(), s.verify = cacert) when it's not passed in via s.get(url, verify=cacert). --- requests/sessions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/sessions.py b/requests/sessions.py index d73d700fa6..7a368368cd 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -541,7 +541,7 @@ def get(self, url, **kwargs): :param \*\*kwargs: Optional arguments that ``request`` takes. :rtype: requests.Response """ - + kawrgs.setdefault('verify', self.verify) kwargs.setdefault('allow_redirects', True) return self.request('GET', url, **kwargs) From a34a5ffc51bb51cd0a5a047036d93911954f3268 Mon Sep 17 00:00:00 2001 From: AndTheDaysGoBy Date: Fri, 11 Jan 2019 16:42:51 -0600 Subject: [PATCH 2/3] Update sessions.py --- requests/sessions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/sessions.py b/requests/sessions.py index 7a368368cd..756c82bfa5 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -541,7 +541,7 @@ def get(self, url, **kwargs): :param \*\*kwargs: Optional arguments that ``request`` takes. :rtype: requests.Response """ - kawrgs.setdefault('verify', self.verify) + kwargs.setdefault('verify', self.verify) kwargs.setdefault('allow_redirects', True) return self.request('GET', url, **kwargs) From c729dcd3b9297bf1dab3e66931b096be1c34377b Mon Sep 17 00:00:00 2001 From: AndTheDaysGoBy Date: Wed, 21 Aug 2019 16:43:40 -0500 Subject: [PATCH 3/3] Revert "Use default cacert" This reverts commit dc3593334770d8bae4b486f4838eb1b090a03349. --- requests/sessions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requests/sessions.py b/requests/sessions.py index 4d7dd24f4b..31d7cc7715 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -545,7 +545,11 @@ def get(self, url, **kwargs): :param \*\*kwargs: Optional arguments that ``request`` takes. :rtype: requests.Response """ +<<<<<<< HEAD kwargs.setdefault('verify', self.verify) +======= + +>>>>>>> parent of dc359333... Use default cacert kwargs.setdefault('allow_redirects', True) return self.request('GET', url, **kwargs)