diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-27 16:48:03 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-27 16:48:03 -0500 |
| commit | 0a2c2e0975c3037372b47b09a7f547eb197ef7d7 (patch) | |
| tree | a9bf06911ddd8765bb322727dce61c695502dcde /nova/utils.py | |
| parent | e2a734a19584a1d46b85e28e427320b4cd1a840c (diff) | |
| parent | 8a8c013cd4513b07e936125a23188e7608f40d58 (diff) | |
| download | nova-0a2c2e0975c3037372b47b09a7f547eb197ef7d7.tar.gz nova-0a2c2e0975c3037372b47b09a7f547eb197ef7d7.tar.xz nova-0a2c2e0975c3037372b47b09a7f547eb197ef7d7.zip | |
trunk merge, getting fierce..
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 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 = {} |