Merge "Use cPickle and not just pickle."

2012-03-12 22:45:34 +00:00
parent 83632606a9 0b4d1517c0
commit dbddc7cfea
1 changed files with 1 additions and 4 deletions
--- 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):