summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2012-03-12 21:49:11 +0000
committerAlex Meade <alex.meade@rackspace.com>2012-03-12 21:50:15 +0000
commit00592cfa0b90c66682be2bc31428277c35a35c48 (patch)
treea69a2bce587397d9970bee77ef16f7ef83cecccf /nova
parente18996253ccde16aaf65866d85d05372b75b3a1f (diff)
downloadnova-00592cfa0b90c66682be2bc31428277c35a35c48.tar.gz
nova-00592cfa0b90c66682be2bc31428277c35a35c48.tar.xz
nova-00592cfa0b90c66682be2bc31428277c35a35c48.zip
Use cPickle and not just pickle.
Fixes bug 953423 cPickle is up to 1000 times faster than pickle. We should use it instead. Change-Id: I1facbdcf60d88c9fba56687abf75524498d2502e
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/xenapi/vm_utils.py2
-rw-r--r--nova/virt/xenapi/vmops.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 47943b009..4d01510d9 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -21,10 +21,10 @@ their attributes like VDIs, VIFs, as well as their lookup functions.
"""
import contextlib
+import cPickle as pickle
import decimal
import json
import os
-import pickle
import re
import time
import urllib
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 506c0fcdb..eb2022ab5 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -21,10 +21,10 @@ Management class for VM-related functions (spawn, reboot, etc).
import base64
import binascii
+import cPickle as pickle
import functools
import json
import os
-import pickle
import time
import uuid