From a4f1b642fbb683d0534e32af4929c483ce503c2a Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 29 Apr 2014 17:21:29 +0200
Subject: [PATCH] Synced jsonutils from oslo-incubator

The sync includes change that drastically enhances performance on Python
2.6 with fresh simplejson library installed.

The latest commit in oslo-incubator:
- 732bdb6297eb9de81667f7713ebcb1ccc2ee45a7

Change-Id: Ib3dc0b713ed90396919feba018772243b3b9c90f
Closes-Bug: 1314129
---
 marconi/openstack/common/jsonutils.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/marconi/openstack/common/jsonutils.py b/marconi/openstack/common/jsonutils.py
index 43fe0c6ba..76d103346 100644
--- a/marconi/openstack/common/jsonutils.py
+++ b/marconi/openstack/common/jsonutils.py
@@ -35,7 +35,17 @@ import datetime
 import functools
 import inspect
 import itertools
-import json
+import sys
+
+if sys.version_info < (2, 7):
+    # On Python <= 2.6, json module is not C boosted, so try to use
+    # simplejson module if available
+    try:
+        import simplejson as json
+    except ImportError:
+        import json
+else:
+    import json
 
 import six
 import six.moves.xmlrpc_client as xmlrpclib