Merge "Update callback with proper bytes transferred"

This commit is contained in:
Jenkins 2014-04-09 00:11:15 +00:00 committed by Gerrit Code Review
commit 62087ab051

View File

@ -778,13 +778,15 @@ class File(Base):
transferred = 0
buff = data.read(block_size)
buff_len = len(buff)
try:
while len(buff) > 0:
while buff_len > 0:
self.conn.put_data(buff)
buff = data.read(block_size)
transferred += len(buff)
transferred += buff_len
if callable(callback):
callback(transferred, self.size)
buff = data.read(block_size)
buff_len = len(buff)
self.conn.put_end()
except socket.timeout as err: