Skip to content

support proxy connection for rest client #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2020
Merged

support proxy connection for rest client #462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions atlassian/rest_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AtlassianRestAPI(object):

def __init__(self, url, username=None, password=None, timeout=60, api_root='rest/api', api_version='latest',
verify_ssl=True, session=None, oauth=None, cookies=None, advanced_mode=None, kerberos=None,
cloud=False):
cloud=False, proxies=None):
if ('atlassian.net' in url or 'jira.com' in url) \
and '/wiki' not in url \
and self.__class__.__name__ in 'Confluence':
Expand All @@ -38,6 +38,7 @@ def __init__(self, url, username=None, password=None, timeout=60, api_root='rest
self.cookies = cookies
self.advanced_mode = advanced_mode
self.cloud = cloud
self.proxies = proxies
if session is None:
self._session = requests.Session()
else:
Expand Down Expand Up @@ -148,7 +149,8 @@ def request(self, method='GET', path='/', data=None, flags=None, params=None, he
data=data,
timeout=self.timeout,
verify=self.verify_ssl,
files=files
files=files,
proxies=self.proxies
)
response.encoding = 'utf-8'
if self.advanced_mode:
Expand Down