summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2011-06-24 09:54:38 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2011-06-24 09:54:38 +0400
commitd4fc1d77a4b7c668453042b83e34da76ee3c3818 (patch)
treeed38cabbd3815bc3e871c220f465708fa0731510 /nova/utils.py
parent0e2b3e932d3e5fe00fed1da95e55808391d4832e (diff)
downloadnova-d4fc1d77a4b7c668453042b83e34da76ee3c3818.tar.gz
nova-d4fc1d77a4b7c668453042b83e34da76ee3c3818.tar.xz
nova-d4fc1d77a4b7c668453042b83e34da76ee3c3818.zip
Unwind last commit, force anyjson to use our serialization methods.
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 691134ada..a77cf7993 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -525,6 +525,15 @@ def loads(s):
return json.loads(s)
+try:
+ import anyjson
+except ImportError:
+ pass
+else:
+ anyjson._modules.append(("nova.utils", "dumps", TypeError, "loads", ValueError))
+ anyjson.force_implementation("nova.utils")
+
+
_semaphores = {}