Skip to content
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

Adding kwargs to *_uri methods #43

Open
wants to merge 1 commit into
base: Development
Choose a base branch
from
Open

Adding kwargs to *_uri methods #43

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
17 changes: 8 additions & 9 deletions pytos/common/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def _is_running_on_localhost(self):
else:
return False

def get_uri(self, uri, expected_status_codes=None, headers=None, timeout=None, max_retries=None, session=None):
def get_uri(self, uri, expected_status_codes=None, headers=None, timeout=None, max_retries=None, session=None, **kwargs):
"""Make a GET request to a URI for the configured host.

:param uri: The URI relative to the configured host to GET.
Expand All @@ -75,8 +75,7 @@ def get_uri(self, uri, expected_status_codes=None, headers=None, timeout=None, m
"""
if headers is None:
headers = {}
expected_status_codes = expected_status_codes
timeout = timeout

if timeout is None:
timeout = self.timeout
if max_retries is None:
Expand All @@ -86,7 +85,7 @@ def get_uri(self, uri, expected_status_codes=None, headers=None, timeout=None, m
headers=headers, verify_ssl=False,
expected_status_codes=expected_status_codes,
timeout=timeout, cookies=self.cookie_jar,
session=session, max_retries=max_retries)
session=session, max_retries=max_retries, **kwargs)
return get_request

def post_uri(self, uri, body=None, params_dict=None, multi_part_form_params=None, expected_status_codes=None,
Expand Down Expand Up @@ -147,7 +146,7 @@ def post_uri(self, uri, body=None, params_dict=None, multi_part_form_params=None
return post_request

def put_uri(self, uri, body=None, expected_status_codes=None, headers=None, timeout=None,
session=None):
session=None, **kwargs):
"""Make a PUT request to a URI for the configured host.

:param uri: The URI relative to the configured host to PUT.
Expand All @@ -172,10 +171,10 @@ def put_uri(self, uri, body=None, expected_status_codes=None, headers=None, time
login_data=self.login_data, verify_ssl=False,
expected_status_codes=expected_status_codes,
timeout=timeout, cookies=self.cookie_jar,
session=session)
session=session, **kwargs)
return put_request

def delete_uri(self, uri, headers=None, session=None, **kwargs):
def delete_uri(self, uri, headers=None, session=None, timeout=None, **kwargs):
"""Make a DELETE request to a URI for the configured host.

:param uri: The URI relative to the configured host to DELETE.
Expand All @@ -189,15 +188,15 @@ def delete_uri(self, uri, headers=None, session=None, **kwargs):
expected_status_codes = kwargs.get("expected_status_codes")
if headers is None:
headers = {}
timeout = kwargs.get("timeout")

if timeout is None:
timeout = self.timeout

delete_request = rest_requests.DELETE_Request(self._real_hostname, uri, headers=headers,
login_data=self.login_data, verify_ssl=False,
expected_status_codes=expected_status_codes,
timeout=timeout, cookies=self.cookie_jar,
session=session)
session=session, **kwargs)
return delete_request

@classmethod
Expand Down