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

5 files changed, 5 insertions, 8 deletions

diff --git a/bin/nova-spoolsentry b/bin/nova-spoolsentry
index 8f54b0929..7f5134975 100755
--- a/bin/nova-spoolsentry
+++ b/bin/nova-spoolsentry
@@ -19,6 +19,7 @@
 
 
 import base64
+import cPickle as pickle
 import json
 import logging
 import os
@@ -26,10 +27,6 @@ import shutil
 import sys
 import urllib
 import urllib2
-try:
-    import cPickle as pickle
-except Exception:
-    import pickle
 
 
 class SpoolSentry(object):
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
 
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 95fe54524..0020ad5bd 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -21,6 +21,7 @@
 # XenAPI plugin for managing glance images
 #
 
+import cPickle as pickle
 import httplib
 try:
     import json
@@ -30,7 +31,6 @@ except ImportError:
 import md5
 import os
 import os.path
-import pickle
 import shlex
 import shutil
 import subprocess
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index c9e350259..1e1fe0f5e 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -19,9 +19,9 @@
 XenAPI Plugin for transfering data between host nodes
 """
 
+import cPickle as pickle
 import os
 import os.path
-import pickle
 import shlex
 import shutil
 import subprocess