Skip to content

Commit d97aed8

Browse files
authored
Merge pull request atlassian-api#319 from gonchik/master
Return value for DELETE method
2 parents eddb0e3 + 3b9361d commit d97aed8

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

atlassian/rest_client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class AtlassianRestAPI(object):
2121

2222
def __init__(self, url, username=None, password=None, timeout=60, api_root='rest/api', api_version='latest',
2323
verify_ssl=True, session=None, oauth=None, cookies=None, advanced_mode=None):
24-
2524
if ('atlassian.net' in url or 'jira.com' in url) and '/wiki' not in url:
2625
url = self.url_joiner(url, '/wiki')
2726
self.url = url
@@ -221,4 +220,11 @@ def delete(self, path, data=None, headers=None, params=None, trailing=None):
221220
:return: Empty dictionary to have consistent interface.
222221
Some of Atlassian REST resources don't return any content.
223222
"""
224-
self.request('DELETE', path=path, data=data, headers=headers, params=params, trailing=trailing)
223+
response = self.request('DELETE', path=path, data=data, headers=headers, params=params, trailing=trailing)
224+
if self.advanced_mode:
225+
return response
226+
try:
227+
return response.json()
228+
except ValueError:
229+
log.debug('Received response with no content')
230+
return None

0 commit comments

Comments
 (0)