cPickle is deprecated in py3, replacing it from six.moves

cPickle is deprecated and should be replaced with six.moves
to provide py2 and py3 compatibility.

Change-Id: Ibad990708722360d188c641e61444d50a16a1e93

swift/account/backend.py

@@ -18,7 +18,7 @@ Pluggable Back-end for Account Server
 
 from uuid import uuid4
 import time
-import cPickle as pickle
+import six.moves.cPickle as pickle
 
 import sqlite3
 

swift/common/db.py

@@ -23,7 +23,7 @@ from uuid import uuid4
 import sys
 import time
 import errno
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from swift import gettext_ as _
 from tempfile import mkstemp
 

swift/common/memcached.py

@@ -44,7 +44,7 @@ version is at:
 http://github.com/memcached/memcached/blob/1.4.2/doc/protocol.txt
 """
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import logging
 import time
 from bisect import bisect

swift/common/ring/builder.py

@@ -20,7 +20,7 @@ import itertools
 import logging
 import math
 import random
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from copy import deepcopy
 
 from array import array

swift/common/ring/ring.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import array
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import inspect
 from collections import defaultdict
 from gzip import GzipFile

swift/common/utils.py

@@ -47,7 +47,7 @@ try:
     import simplejson as json
 except ImportError:
     import json
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import glob
 from urlparse import urlparse as stdlib_urlparse, ParseResult
 import itertools

swift/container/backend.py

@@ -19,7 +19,7 @@ Pluggable Back-ends for Container Server
 import os
 from uuid import uuid4
 import time
-import cPickle as pickle
+import six.moves.cPickle as pickle
 
 from six.moves import range
 import sqlite3

swift/obj/diskfile.py

@@ -30,7 +30,7 @@ The remaining methods in this module are considered implementation specific and
 are also not considered part of the backend API.
 """
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import errno
 import fcntl
 import os

swift/obj/reconstructor.py

@@ -19,7 +19,7 @@ import random
 import time
 import itertools
 from collections import defaultdict
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import shutil
 
 from eventlet import (GreenPile, GreenPool, Timeout, sleep, hubs, tpool,

swift/obj/replicator.py

@@ -20,7 +20,7 @@ import random
 import shutil
 import time
 import itertools
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from swift import gettext_ as _
 
 import eventlet

swift/obj/server.py

@@ -15,7 +15,7 @@
 
 """ Object Server for Swift """
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import json
 import os
 import multiprocessing

swift/obj/updater.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import os
 import signal
 import sys

test/unit/__init__.py

@@ -41,7 +41,7 @@ from httplib import HTTPException
 from swift.common import storage_policy
 from swift.common.storage_policy import StoragePolicy, ECStoragePolicy
 import functools
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from gzip import GzipFile
 import mock as mocklib
 import inspect

test/unit/common/ring/test_builder.py

@@ -19,7 +19,7 @@ import mock
 import operator
 import os
 import unittest
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from array import array
 from collections import defaultdict
 from math import ceil

test/unit/common/ring/test_ring.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import array
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import os
 import sys
 import unittest

test/unit/common/test_db.py

@@ -21,7 +21,7 @@ import unittest
 from tempfile import mkdtemp
 from shutil import rmtree, copy
 from uuid import uuid4
-import cPickle as pickle
+import six.moves.cPickle as pickle
 
 import simplejson
 import sqlite3

test/unit/container/test_updater.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import mock
 import os
 import unittest

test/unit/obj/test_diskfile.py

@@ -16,7 +16,7 @@
 
 """Tests for swift.obj.diskfile"""
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import os
 import errno
 import itertools

test/unit/obj/test_reconstructor.py

@@ -17,7 +17,7 @@ import unittest
 import os
 from hashlib import md5
 import mock
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import tempfile
 import time
 import shutil

test/unit/obj/test_replicator.py

@@ -18,7 +18,7 @@ import os
 import mock
 from gzip import GzipFile
 from shutil import rmtree
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import time
 import tempfile
 from contextlib import contextmanager, closing

test/unit/obj/test_server.py

@@ -16,7 +16,7 @@
 
 """Tests for swift.obj.server"""
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import datetime
 import json
 import errno

test/unit/obj/test_updater.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import mock
 import os
 import unittest