Merge pull request #210 from mbohlool/automated-cherry-pick-of-#205-upstream-release-1.0

Automated cherry pick of #205
This commit is contained in:
Mehdy Bohlool 2017-05-03 17:25:36 -07:00 committed by GitHub
commit 39eeff664d

View File

@ -154,8 +154,8 @@ class RESTClientObject(object):
if query_params:
url += '?' + urlencode(query_params)
if headers['Content-Type'] == 'application/json-patch+json':
headers[
'Content-Type'] = 'application/strategic-merge-patch+json'
if not isinstance(body, list):
headers['Content-Type'] = 'application/strategic-merge-patch+json'
request_body = None
if body:
request_body = json.dumps(body)