From b8b0c6a74eaa1ae3850d8f6761b65c6051a193b1 Mon Sep 17 00:00:00 2001 From: "Gavin M. Roy" Date: Wed, 13 May 2015 01:09:09 -0400 Subject: [PATCH] Decorator and content-type cleanup --- consulate/adapters.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/consulate/adapters.py b/consulate/adapters.py index 92dc433..df90a87 100644 --- a/consulate/adapters.py +++ b/consulate/adapters.py @@ -13,8 +13,8 @@ LOGGER = logging.getLogger(__name__) -CONTENT_FORM = 'application/x-www-form-urlencoded; charset=UTF-8' -CONTENT_JSON = 'application/json; charset=UTF-8' +CONTENT_FORM = 'application/x-www-form-urlencoded; charset=utf-8' +CONTENT_JSON = 'application/json; charset=utf-8' def prepare_data(fun): @@ -31,8 +31,9 @@ def inner(*args, **kwargs): :param dict kwargs: keyword arguments """ - if kwargs.get('data') and not utils.is_string(kwargs.get('data')): - kwargs['data'] = json.dumps(kwargs['data']) + if kwargs.get('data'): + if not utils.is_string(kwargs.get('data')): + kwargs['data'] = json.dumps(kwargs['data']) elif len(args) == 3 and not utils.is_string(args[2]): args = args[0], args[1], json.dumps(args[2]) return fun(*args, **kwargs)