Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2016-11-09 16:37:11 +08:00
158 changed files with 1842 additions and 1165 deletions

View File

@@ -462,7 +462,7 @@ class ApiClient(object):
content_types = list(map(lambda x: x.lower(), content_types))
if 'application/json' in content_types:
if 'application/json' in content_types or '*/*' in content_types:
return 'application/json'
else:
return content_types[0]