summaryrefslogtreecommitdiff
path: root/gitlab
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2018-01-01 17:28:08 +0100
committerGauvain Pocentek <gauvain@pocentek.net>2018-01-01 17:34:55 +0100
commit6f50447917f3af4ab6611d0fdf7eb9bb67ee32c5 (patch)
treecf7f9744b77de01aba573302645d108a0b9fe2e5 /gitlab
parent2e2a78da9e3910bceb30bd9ac9e574b8b1425d05 (diff)
downloadgitlab-6f50447917f3af4ab6611d0fdf7eb9bb67ee32c5.tar.gz
Respect content of REQUESTS_CA_BUNDLE and *_proxy envvars
Explicitly call the requests session.merge_environment_settings() method, which will use some environment variables to setup the session properly. Closes #352
Diffstat (limited to 'gitlab')
-rw-r--r--gitlab/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 738085a..89a787a 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -677,8 +677,9 @@ class Gitlab(object):
files=files, **opts)
prepped = self.session.prepare_request(req)
prepped.url = sanitized_url(prepped.url)
- result = self.session.send(prepped, stream=streamed, verify=verify,
- timeout=timeout)
+ settings = self.session.merge_environment_settings(
+ prepped.url, {}, streamed, verify, None)
+ result = self.session.send(prepped, timeout=timeout, **settings)
if 200 <= result.status_code < 300:
return result