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

git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@483 67cdc799-7952-0410-af00-57a81ceafa0f

1 files changed, 3 insertions, 9 deletions

diff --git a/fs/remote.py b/fs/remote.py
index db50b5c..19cceb1 100644
--- a/fs/remote.py
+++ b/fs/remote.py
@@ -215,15 +215,9 @@ class RemoteFileBuffer(object):
                 self.file.seek(curpos)
         
     def read(self, length=None):
-        if length is None:
-            self._fillbuffer()
-            return self.file.read()
-        else:
-            toread = self.file.tell() + length - self._readlen
-            if toread > 0:
-                self._fillbuffer(toread)
-            return self.file.read(length)
-        
+        self._fillbuffer(length)
+        return self.file.read(length if length != None else -1)
+
     def seek(self,offset,whence=SEEK_SET):           
         if isinstance(self.file,SpooledTemporaryFile):
             #  SpooledTemporaryFile.seek doesn't roll to disk if seeking