X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=blobdiff_plain;f=lib%2Fbup%2Fhlinkdb.py;h=f953a32d321e2b9d3d634a09554c3ef1efa2eb9f;hp=d4125aef44837084983e712ad67f483a88943f9a;hb=20442f9afdcd3fc36d69bac3d8b7513920501ee0;hpb=37a70d69445ffb765688257b79ecffb3ff0a0908

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]