Commit 80c9bf05 by rfkelly0

remove unnecessay calculation of 'toread' in RemoteFileBuffer.read()

parent 729f4446
...@@ -215,15 +215,9 @@ class RemoteFileBuffer(object): ...@@ -215,15 +215,9 @@ class RemoteFileBuffer(object):
self.file.seek(curpos) self.file.seek(curpos)
def read(self, length=None): def read(self, length=None):
if length is None: self._fillbuffer(length)
self._fillbuffer() return self.file.read(length if length != None else -1)
return self.file.read()
else:
toread = self.file.tell() + length - self._readlen
if toread > 0:
self._fillbuffer(toread)
return self.file.read(length)
def seek(self,offset,whence=SEEK_SET): def seek(self,offset,whence=SEEK_SET):
if isinstance(self.file,SpooledTemporaryFile): if isinstance(self.file,SpooledTemporaryFile):
# SpooledTemporaryFile.seek doesn't roll to disk if seeking # SpooledTemporaryFile.seek doesn't roll to disk if seeking
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment