From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 27 Jul 2020 21:15:16 +0000 (+0200)
Subject: hlinkdb: always load as bytes on python3
X-Git-Tag: 0.31~21
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=20442f9afdcd3fc36d69bac3d8b7513920501ee0

hlinkdb: always load as bytes on python3

We really need this to be bytes, so always load as such.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: changed %s to %d]
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/lib/bup/hlinkdb.py b/lib/bup/hlinkdb.py
index d4125ae..f953a32 100644
--- a/lib/bup/hlinkdb.py
+++ b/lib/bup/hlinkdb.py
@@ -6,8 +6,11 @@ from bup import compat
 
 if compat.py_maj > 2:
     import pickle
+    def pickle_load(f):
+        return pickle.load(f, encoding='bytes')
 else:
     import cPickle as pickle
+    pickle_load = pickle.load
 
 
 class Error(Exception):
@@ -32,7 +35,7 @@ class HLinkDB:
                 raise
         if f:
             try:
-                self._node_paths = pickle.load(f)
+                self._node_paths = pickle_load(f)
             finally:
                 f.close()
                 f = None
@@ -94,7 +97,7 @@ class HLinkDB:
 
     def add_path(self, path, dev, ino):
         # Assume path is new.
-        node = '%s:%s' % (dev, ino)
+        node = b'%d:%d' % (dev, ino)
         self._path_node[path] = node
         link_paths = self._node_paths.get(node)
         if link_paths and path not in link_paths:
@@ -122,5 +125,5 @@ class HLinkDB:
             del self._path_node[path]
 
     def node_paths(self, dev, ino):
-        node = '%s:%s' % (dev, ino)
+        node = b'%d:%d' % (dev, ino)
         return self._node_paths[node]