You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/11/05 22:09:06 UTC

[allura] 02/04: [#8379] preserve same pickle format as used on py2 for db consistency and interoperability if py2 procs (taskd) in use during a transition

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8379
in repository https://gitbox.apache.org/repos/asf/allura.git

commit f5f7979f76524a19333b920334705b4bff86174b
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Thu Nov 5 10:29:16 2020 -0500

    [#8379] preserve same pickle format as used on py2 for db consistency and interoperability if py2 procs (taskd) in use during a transition
---
 Allura/allura/model/index.py        | 2 +-
 Allura/allura/model/repo_refresh.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Allura/allura/model/index.py b/Allura/allura/model/index.py
index 0b8a3a4..790667a 100644
--- a/Allura/allura/model/index.py
+++ b/Allura/allura/model/index.py
@@ -84,7 +84,7 @@ class ArtifactReference(object):
             obj = cls(
                 _id=artifact.index_id(),
                 artifact_reference=dict(
-                    cls=bson.Binary(dumps(artifact.__class__)),
+                    cls=bson.Binary(dumps(artifact.__class__, protocol=2)),
                     project_id=artifact.app_config.project_id,
                     app_config_id=artifact.app_config._id,
                     artifact_id=artifact._id))
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index 8eb6b32..fa4a9d7 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -137,7 +137,7 @@ def refresh_commit_repos(all_commit_ids, repo):
             ref = ArtifactReferenceDoc(dict(
                 _id=index_id,
                 artifact_reference=dict(
-                    cls=bson.Binary(dumps(Commit)),
+                    cls=bson.Binary(dumps(Commit, protocol=2)),
                     project_id=repo.app.config.project_id,
                     app_config_id=repo.app.config._id,
                     artifact_id=oid),