From: Daira Hopwood Date: Sat, 11 Oct 2014 22:45:13 +0000 (+0100) Subject: Changes filename to unicode before placing the file. refs #2027 X-Git-Tag: allmydata-tahoe-1.10.1a1~77^2~4 X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson?a=commitdiff_plain;h=8147f3c77e0704ea0b6909c90ff466bfde845ee2;p=tahoe-lafs%2Ftahoe-lafs.git Changes filename to unicode before placing the file. refs #2027 Author: Mark Berger Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/scripts/tahoe_cp.py b/src/allmydata/scripts/tahoe_cp.py index 3bb9550a..25c3b2e4 100644 --- a/src/allmydata/scripts/tahoe_cp.py +++ b/src/allmydata/scripts/tahoe_cp.py @@ -703,6 +703,7 @@ class Copier: def copy_files_to_target(self, targetmap, target): for name, source in targetmap.items(): assert isinstance(source, (LocalFileSource, TahoeFileSource)) + name = unicode(name) self.copy_file_into(source, name, target) self.files_copied += 1 self.progress("%d/%d files, %d/%d directories" % @@ -743,6 +744,7 @@ class Copier: def copy_file_into(self, source, name, target): assert isinstance(source, (LocalFileSource, TahoeFileSource)) assert isinstance(target, (LocalDirectoryTarget, TahoeDirectoryTarget)) + assert isinstance(name, unicode) if self.need_to_copy_bytes(source, target): # if the target is a local directory, this will just write the # bytes to disk. If it is a tahoe directory, it will upload the