From c6360288ec49409d113f10dfe98a526ee60a3c47 Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Thu, 21 Jun 2012 16:24:01 +0100 Subject: [PATCH] anyjson 0.3.2 now supports buffer objects, so pass them on --- kombu/serialization.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kombu/serialization.py b/kombu/serialization.py index 54da27cf..29542515 100644 --- a/kombu/serialization.py +++ b/kombu/serialization.py @@ -286,9 +286,9 @@ def register_json(): from anyjson import loads, dumps def _loads(obj): - if isinstance(obj, buffer): - obj = str(obj) - return loads(bytes_to_str(obj)) + if isinstance(obj, str): + obj = bytes_to_str(obj) + return loads(obj) registry.register('json', dumps, _loads, content_type='application/json',