return all the data when reading is finished in EOFReader

This commit is contained in:
benoitc 2010-06-09 16:07:38 +02:00
parent c52e30bcef
commit 5b860b532a

View File

@ -146,7 +146,7 @@ class EOFReader(object):
raise TypeError("size must be an integral type") raise TypeError("size must be an integral type")
if size < 0: if size < 0:
raise ValueError("Size must be positive.") raise ValueError("Size must be positive.")
if size == 0: if size == 0 or self.finished:
return "" return ""
data = self.unreader.read() data = self.unreader.read()
@ -158,6 +158,7 @@ class EOFReader(object):
if not data: if not data:
self.finished = True self.finished = True
return self.buf.getvalue()
data = self.buf.getvalue() data = self.buf.getvalue()
ret, rest = data[:size], data[size:] ret, rest = data[:size], data[size:]