[Reproducible-commits] [diffoscope] 01/01: Return the target path as string when extracting from a Zip

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository diffoscope.

commit 8e806864e3e4456d9caa7fefcafceae55a3abd0d
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Nov 24 09:38:48 2015 +0000

    Return the target path as string when extracting from a Zip
    
    The path must be returned as a string and not as bytes. Regression
    introduced in 7367033.
    
    Closes: #805774
---
 diffoscope/comparators/zip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diffoscope/comparators/zip.py b/diffoscope/comparators/zip.py
index dd7b915..801b54c 100644
--- a/diffoscope/comparators/zip.py
+++ b/diffoscope/comparators/zip.py
@@ -89,7 +89,7 @@ class ZipContainer(Archive):
         targetpath = os.path.join(dest_dir, os.path.basename(member_name)).encode(sys.getfilesystemencoding(), errors='replace')
         with self.archive.open(member_name) as source, open(targetpath, 'wb') as target:
             shutil.copyfileobj(source, target)
-        return targetpath
+        return targetpath.decode(sys.getfilesystemencoding())
 
     def get_member(self, member_name):
         zipinfo = self.archive.getinfo(member_name)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git