Skip to content

Commit f72fa10

Browse files
Fixed bug where json import was getting overridden with argument (#538)
1 parent 5f67ef8 commit f72fa10

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

atlassian/rest_client.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# coding=utf-8
2-
import json
32
import logging
4-
53
import requests
4+
from json import dumps
65
from oauthlib.oauth1 import SIGNATURE_RSA
76
from requests_oauthlib import OAuth1
87
from six.moves.urllib.parse import urlencode
@@ -101,7 +100,7 @@ def log_curl_debug(self, method, url, data=None, headers=None, level=logging.DEB
101100
message = "curl --silent -X {method} -H {headers} {data} '{url}'".format(
102101
method=method,
103102
headers=' -H '.join(["'{0}: {1}'".format(key, value) for key, value in headers.items()]),
104-
data='' if not data else "--data '{0}'".format(json.dumps(data)),
103+
data='' if not data else "--data '{0}'".format(dumps(data)),
105104
url=url)
106105
log.log(level=level, msg=message)
107106

@@ -138,8 +137,8 @@ def request(self, method='GET', path='/', data=None, json=None, flags=None, para
138137
if flags:
139138
url += ('&' if params else '') + '&'.join(flags or [])
140139
if files is None:
141-
data = None if not data else json.dumps(data)
142-
json_dump = None if not json else json.dumps(json)
140+
data = None if not data else dumps(data)
141+
json_dump = None if not json else dumps(json)
143142
self.log_curl_debug(method=method, url=url, headers=headers,
144143
data=data if data else json_dump)
145144

@@ -192,7 +191,7 @@ def get(self, path, data=None, flags=None, params=None, headers=None, not_json_r
192191
return response.text
193192

194193
def post(self, path, data=None, json=None, headers=None, files=None, params=None, trailing=None):
195-
response = self.request('POST', path=path, data=data, json=None, headers=headers, files=files, params=params,
194+
response = self.request('POST', path=path, data=data, json=json, headers=headers, files=files, params=params,
196195
trailing=trailing)
197196
if self.advanced_mode:
198197
return response

0 commit comments

Comments
 (0)