jjb/python-jenkins
Code Issues Proposed changes

Merge "Fix: send proxy as empty dict"

Browse Source
This commit is contained in:
Zuul
2018-05-31 18:50:49 +00:00
committed by Gerrit Code Review
parent e391e92bad a11edaca52
commit a3c3672a6f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/__init__.py
View File

@@ -526,7 +526,7 @@ class Jenkins(object):
# requests.Session.send() does not honor env settings by design # requests.Session.send() does not honor env settings by design
# see https://github.com/requests/requests/issues/2807 # see https://github.com/requests/requests/issues/2807
_settings = self._session.merge_environment_settings( _settings = self._session.merge_environment_settings(
r.url, None, None, self._session.verify, None) r.url, {}, None, self._session.verify, None)
_settings['timeout'] = self.timeout _settings['timeout'] = self.timeout
return self._session.send(r, **_settings) return self._session.send(r, **_settings)