summaryrefslogtreecommitdiff
path: root/fs/ftpfs.py
diff options
context:
space:
mode:
authorgcode@loowis.durge.org <gcode@loowis.durge.org@67cdc799-7952-0410-af00-57a81ceafa0f>2012-08-15 03:07:49 +0000
committergcode@loowis.durge.org <gcode@loowis.durge.org@67cdc799-7952-0410-af00-57a81ceafa0f>2012-08-15 03:07:49 +0000
commitef89627bc6818a7cd086b80b82cfcea4ee4dd271 (patch)
tree1e3f72f43f5258c76470adccce006c17ce353635 /fs/ftpfs.py
parent2f0138a2ce0376baf31e74a6127db8e7a7c78a62 (diff)
downloadpyfilesystem-git-ef89627bc6818a7cd086b80b82cfcea4ee4dd271.tar.gz
Found and fixed some more sneaky Python3 str->bytes problems
Diffstat (limited to 'fs/ftpfs.py')
-rw-r--r--fs/ftpfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ftpfs.py b/fs/ftpfs.py
index 99c7b46..50891af 100644
--- a/fs/ftpfs.py
+++ b/fs/ftpfs.py
@@ -667,7 +667,7 @@ class _FTPFile(object):
break
chunks.append(data)
self.read_pos += len(data)
- return ''.join(chunks)
+ return b('').join(chunks)
remaining_bytes = size
while remaining_bytes: