diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-06-28 08:12:56 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-06-28 08:12:56 -0700 |
| commit | b497b7b95124fa52259637d0fc1a67f4ff625b0c (patch) | |
| tree | fc7d84ea68e74e2319ff9299b01ece51028e0ef5 /nova/utils.py | |
| parent | e611d3210911bfb6276da495d0b3943d2ce1b511 (diff) | |
| parent | 53b067431a4484ff243546f99c938b76f8f67972 (diff) | |
| download | nova-b497b7b95124fa52259637d0fc1a67f4ff625b0c.tar.gz nova-b497b7b95124fa52259637d0fc1a67f4ff625b0c.tar.xz nova-b497b7b95124fa52259637d0fc1a67f4ff625b0c.zip | |
Merged trunk
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py index e2ac16f31..6d8324e5b 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -526,6 +526,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 = {} |