summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorJason Koelker <jason@koelker.net>2011-06-27 16:49:33 -0500
committerJason Koelker <jason@koelker.net>2011-06-27 16:49:33 -0500
commit06bc61dbe63182bfc3d95de0c7330ccdc1210379 (patch)
tree3b1f05118d773ae46a6ad2c129f6a789669dd43b /nova/utils.py
parent42f97776424df69889b369d5fdd17653e5ac887b (diff)
parent0a2c2e0975c3037372b47b09a7f547eb197ef7d7 (diff)
merge with trey
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py
index b49849f9a..4a66dd993 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -518,6 +518,16 @@ 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 = {}