two more changes for python3 in the bytes vs str area
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 31 Dec 2018 15:32:23 +0000 (16:32 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 31 Dec 2018 17:48:41 +0000 (18:48 +0100)
conf_files.py

index 51a5b17..b13836f 100755 (executable)
@@ -29,7 +29,7 @@ class conf_files:
     def checksum(self, path):
         try:
             with open(path) as feed:
-                return sha(feed.read()).digest()
+                return sha(feed.read().encode()).digest()
         except IOError:
             return None
 
@@ -85,7 +85,7 @@ class conf_files:
             os.makedirs(os.path.dirname(dest))
         except OSError:
             pass
-        tools.write_file(dest, lambda f: f.write(contents),
+        tools.write_file(dest, lambda f: f.write(contents.decode()),
                          mode=mode, uidgid=(uid, gid))
         if self.system(cf_rec['postinstall_cmd']):
             self.system(err_cmd)