From d50c4d79e929350b85d6b634b1b547584cf27969 Mon Sep 17 00:00:00 2001 From: Thomas Kliszowski Date: Tue, 10 Jan 2017 11:19:55 +0100 Subject: [PATCH] fix python 2.6 compatibility --- json_reindent/utils.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/json_reindent/utils.py b/json_reindent/utils.py index f1c30e2..1843431 100644 --- a/json_reindent/utils.py +++ b/json_reindent/utils.py @@ -21,10 +21,18 @@ def ordered_load(stream, use_collections=True): def json_ordered_load(stream, object_pairs_hook): - return json.loads( - stream, - strict=False, - object_pairs_hook=object_pairs_hook) + params = { + 's': stream, + 'strict': False, + 'object_pairs_hook': object_pairs_hook + } + + try: + return json.loads(**params) + except TypeError: + # Fix python 2.6 + del params['object_pairs_hook'] + return json.loads(**params) def yaml_ordered_load(stream, object_pairs_hook, Loader=yaml.Loader):