Use protocol=2 for pickle.dump() calls, so that pickles written by py3k will

be backward compatible.

svn path=/main/trunk/; revision=12821

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 4d1f4792ffb026f2e57057b62b9efd6dbe824222..88ec8bde3831a7958b23926eff518504c85ba9c6 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4194,7 +4194,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
                        secpass >= 2:
                        try:
                                f = portage.util.atomic_ofstream(self._cache_filename, mode='wb')
-                               pickle.dump(self._cache_data, f, -1)
+                               pickle.dump(self._cache_data, f, protocol=2)
                                f.close()
                                portage.util.apply_secpass_permissions(
                                        self._cache_filename, gid=portage.portage_gid, mode=0644)

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 53ae5404891ffbb262d7a3ab755a1f3514e2a6d9..24997e2801adb7a47fa705ab44b4a76cb560e5a4 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7541,7 +7541,7 @@ def commit_mtimedb(mydict=None, filename=None):
        d.update(mydict)
        try:
                f = atomic_ofstream(filename, mode='wb')
-               pickle.dump(d, f, -1)
+               pickle.dump(d, f, protocol=2)
                f.close()
                portage.util.apply_secpass_permissions(filename,
                        uid=uid, gid=portage_gid, mode=0644)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8ceff86e652091cdf4e44cd9cd17700a350c0e9a..e3dc6a04972725571a87c358e66c97aa9c08826a 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -81,7 +81,7 @@ class PreservedLibsRegistry(object):
                        return
                try:
                        f = atomic_ofstream(self._filename, 'wb')
-                       pickle.dump(self._data, f)
+                       pickle.dump(self._data, f, protocol=2)
                        f.close()
                except EnvironmentError, e:
                        if e.errno != PermissionDenied.errno:
@@ -1033,7 +1033,7 @@ class vardbapi(dbapi):
                        del self._aux_cache["modified"]
                        try:
                                f = atomic_ofstream(self._aux_cache_filename, 'wb')
-                               pickle.dump(self._aux_cache, f, -1)
+                               pickle.dump(self._aux_cache, f, protocol=2)
                                f.close()
                                apply_secpass_permissions(
                                        self._aux_cache_filename, gid=portage_gid, mode=0644)

diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 02e5de27761c5577b6dffe0baed2d37ccd260018..29e2ff4f871b6ef64106800a42175231a66ecb93 100644 (file)
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -581,7 +581,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
                                        sys.stderr.flush()
                        try:
                                metadatafile = open(metadatafilename, 'wb')
-                               pickle.dump(metadata,metadatafile)
+                               pickle.dump(metadata, metadatafile, protocol=2)
                                metadatafile.close()
                        except SystemExit, e:
                                raise
@@ -673,11 +673,11 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
                if "modified" in metadata[baseurl] and metadata[baseurl]["modified"]:
                        metadata[baseurl]["timestamp"] = int(time.time())
                        metadatafile = open(metadatafilename, 'wb')
-                       pickle.dump(metadata,metadatafile)
+                       pickle.dump(metadata, metadatafile, protocol=2)
                        metadatafile.close()
                if makepickle:
                        metadatafile = open(makepickle, 'wb')
-                       pickle.dump(metadata[baseurl]["data"],metadatafile)
+                       pickle.dump(metadata[baseurl]["data"], metadatafile, protocol=2)
                        metadatafile.close()
        except SystemExit, e:
                raise