tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Changes filename to unicode before placing the file. refs #2027 

Author: Mark Berger <mark.berger.j@gmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2014-10-11 23:45:13 +01:00
parent b6a645aeb3
commit 8147f3c77e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/scripts/tahoe_cp.py
View File

@ -703,6 +703,7 @@ class Copier:
def copy_files_to_target(self, targetmap, target): def copy_files_to_target(self, targetmap, target):
for name, source in targetmap.items(): for name, source in targetmap.items():
assert isinstance(source, (LocalFileSource, TahoeFileSource)) assert isinstance(source, (LocalFileSource, TahoeFileSource))
name = unicode(name)
self.copy_file_into(source, name, target) self.copy_file_into(source, name, target)
self.files_copied += 1 self.files_copied += 1
self.progress("%d/%d files, %d/%d directories" % self.progress("%d/%d files, %d/%d directories" %
@ -743,6 +744,7 @@ class Copier:
def copy_file_into(self, source, name, target): def copy_file_into(self, source, name, target):
assert isinstance(source, (LocalFileSource, TahoeFileSource)) assert isinstance(source, (LocalFileSource, TahoeFileSource))
assert isinstance(target, (LocalDirectoryTarget, TahoeDirectoryTarget)) assert isinstance(target, (LocalDirectoryTarget, TahoeDirectoryTarget))
assert isinstance(name, unicode)
if self.need_to_copy_bytes(source, target): if self.need_to_copy_bytes(source, target):
# if the target is a local directory, this will just write the # 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 # bytes to disk. If it is a tahoe directory, it will upload the