Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not use readline when reading the content of a part in the multipart reader #1535

Merged
merged 3 commits into from
Jan 26, 2017
Merged

do not use readline when reading the content of a part in the multipart reader #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a780925
do not use readline when reading the content of a part in the multipa…
arthurdarcet Jan 9, 2017
0f78faa
fix the tests
arthurdarcet Jan 9, 2017
03101a0
add regression test
arthurdarcet Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions aiohttp/multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,8 @@ def read(self, *, decode=False):
if self._at_eof:
return b''
data = bytearray()
if self._length is None:
while not self._at_eof:
data.extend((yield from self.readline()))
else:
while not self._at_eof:
data.extend((yield from self.read_chunk(self.chunk_size)))
while not self._at_eof:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

data.extend((yield from self.read_chunk(self.chunk_size)))
if decode:
return self.decode(data)
return data
Expand Down Expand Up @@ -377,12 +373,8 @@ def release(self):
"""
if self._at_eof:
return
if self._length is None:
while not self._at_eof:
yield from self.readline()
else:
while not self._at_eof:
yield from self.read_chunk(self.chunk_size)
while not self._at_eof:
yield from self.read_chunk(self.chunk_size)

@asyncio.coroutine
def text(self, *, encoding=None):
Expand Down
23 changes: 16 additions & 7 deletions tests/test_multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
from aiohttp.helpers import parse_mimetype
from aiohttp.multipart import (content_disposition_filename,
parse_content_disposition)
from aiohttp.streams import DEFAULT_LIMIT as stream_reader_default_limit
from aiohttp.streams import StreamReader


def run_in_loop(f):
Expand Down Expand Up @@ -255,14 +257,13 @@ def test_read_chunk_properly_counts_read_bytes(self):
self.assertEqual(b'.' * size, result)
self.assertTrue(obj.at_eof())

def test_read_does_reads_boundary(self):
def test_read_does_not_read_boundary(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, actually test reads the boundary (: In previous case it just was placed into unread buffer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely sure, but i think it reads the boundary then put in back in the stream (with unread_data) ; so it's as if it wasn't read

stream = Stream(b'Hello, world!\r\n--:')
obj = aiohttp.multipart.BodyPartReader(
self.boundary, {}, stream)
result = yield from obj.read()
self.assertEqual(b'Hello, world!', result)
self.assertEqual(b'', (yield from stream.read()))
self.assertEqual([b'--:'], list(obj._unread))
self.assertEqual(b'--:', (yield from stream.read()))

def test_multiread(self):
obj = aiohttp.multipart.BodyPartReader(
Expand Down Expand Up @@ -474,8 +475,7 @@ def test_release(self):
self.boundary, {}, stream)
yield from obj.release()
self.assertTrue(obj.at_eof())
self.assertEqual(b'\r\nworld!\r\n--:--', stream.content.read())
self.assertEqual([b'--:\r\n'], list(obj._unread))
self.assertEqual(b'--:\r\n\r\nworld!\r\n--:--', stream.content.read())

def test_release_respects_content_length(self):
obj = aiohttp.multipart.BodyPartReader(
Expand All @@ -491,8 +491,7 @@ def test_release_release(self):
self.boundary, {}, stream)
yield from obj.release()
yield from obj.release()
self.assertEqual(b'\r\nworld!\r\n--:--', stream.content.read())
self.assertEqual([b'--:\r\n'], list(obj._unread))
self.assertEqual(b'--:\r\n\r\nworld!\r\n--:--', stream.content.read())

def test_filename(self):
part = aiohttp.multipart.BodyPartReader(
Expand All @@ -501,6 +500,16 @@ def test_filename(self):
None)
self.assertEqual('foo.html', part.filename)

def test_reading_long_part(self):
size = 2 * stream_reader_default_limit
stream = StreamReader()
stream.feed_data(b'0' * size + b'\r\n--:--')
stream.feed_eof()
obj = aiohttp.multipart.BodyPartReader(
self.boundary, {}, stream)
data = yield from obj.read()
self.assertEqual(len(data), size)


class MultipartReaderTestCase(TestCase):

Expand Down
6 changes: 6 additions & 0 deletions tests/test_py35/test_multipart_35.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ def __init__(self, content):
async def read(self, size=None):
return self.content.read(size)

def at_eof(self):
return self.content.tell() == len(self.content.getbuffer())

async def readline(self):
return self.content.readline()

def unread_data(self, data):
self.content = io.BytesIO(data + self.content.read())


async def test_async_for_reader(loop):
data = [{"test": "passed"}, 42, b'plain text', b'aiohttp\n']
Expand Down