Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,6 @@ venv.bak/

#
*.secret

#visual studio code
.vscode
2 changes: 1 addition & 1 deletion atlassian/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.0
1.16.1
11 changes: 7 additions & 4 deletions atlassian/rest_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@ def url_joiner(url, path, trailing=None):
url_link += '/'
return url_link

def request(self, method='GET', path='/', data=None, flags=None, params=None, headers=None,
def request(self, method='GET', path='/', data=None, json=None, flags=None, params=None, headers=None,
files=None, trailing=None):
"""

:param method:
:param path:
:param data:
:param json:
:param flags:
:param params:
:param headers:
Expand All @@ -138,15 +139,17 @@ def request(self, method='GET', path='/', data=None, flags=None, params=None, he
url += ('&' if params else '') + '&'.join(flags or [])
if files is None:
data = None if not data else json.dumps(data)
json_dump = None if not json else json.dumps(json)
self.log_curl_debug(method=method, url=url, headers=headers,
data=data)
data=data if data else json_dump)

headers = headers or self.default_headers
response = self._session.request(
method=method,
url=url,
headers=headers,
data=data,
json=json,
timeout=self.timeout,
verify=self.verify_ssl,
files=files,
Expand Down Expand Up @@ -188,8 +191,8 @@ def get(self, path, data=None, flags=None, params=None, headers=None, not_json_r
log.error(e)
return response.text

def post(self, path, data=None, headers=None, files=None, params=None, trailing=None):
response = self.request('POST', path=path, data=data, headers=headers, files=files, params=params,
def post(self, path, data=None, json=None, headers=None, files=None, params=None, trailing=None):
response = self.request('POST', path=path, data=data, json=None, headers=headers, files=files, params=params,
trailing=trailing)
if self.advanced_mode:
return response
Expand Down
13 changes: 11 additions & 2 deletions atlassian/service_desk.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def create_customer_request(self, service_desk_id, request_type_id,
:param service_desk_id: str
:param request_type_id: str
:param values_dict: str
:param values_dict: str/dict
:param raise_on_behalf_of: str
:param request_participants: list
:return: New request
Expand All @@ -99,7 +99,16 @@ def create_customer_request(self, service_desk_id, request_type_id,
if request_participants:
data["requestParticipants"] = request_participants

return self.post('rest/servicedeskapi/request', data=data, headers=self.experimental_headers)
param_map = {
"headers": self.experimental_headers
}

if isinstance(values_dict, dict):
param_map["json"] = data
elif isinstance(values_dict, str):
param_map["data"] = data

return self.post('rest/servicedeskapi/request', **param_map)

def get_customer_request_status(self, issue_id_or_key):
"""
Expand Down