Drop streamreader payload

CHANGES/2257.removal

@@ -0,0 +1 @@
+Drop `StreamReaderPayload` and `DataQueuePayload`.

aiohttp/payload.py

@@ -1,4 +1,3 @@
-import asyncio
 import io
 import json
 import mimetypes
@@ -11,11 +10,11 @@
 from . import hdrs
 from .helpers import (content_disposition_header, guess_filename,
                       parse_mimetype, sentinel)
-from .streams import DEFAULT_LIMIT, DataQueue, EofStream, StreamReader
+from .streams import DEFAULT_LIMIT
 
 
 __all__ = ('PAYLOAD_REGISTRY', 'get_payload', 'payload_type', 'Payload',
-           'BytesPayload', 'StringPayload', 'StreamReaderPayload',
+           'BytesPayload', 'StringPayload',
            'IOBasePayload', 'BytesIOPayload', 'BufferedReaderPayload',
            'TextIOPayload', 'StringIOPayload', 'JsonPayload')
 
@@ -263,28 +262,6 @@ def size(self):
             return None
 
 
-class StreamReaderPayload(Payload):
-
-    async def write(self, writer):
-        chunk = await self._value.read(DEFAULT_LIMIT)
-        while chunk:
-            await writer.write(chunk)
-            chunk = await self._value.read(DEFAULT_LIMIT)
-
-
-class DataQueuePayload(Payload):
-
-    async def write(self, writer):
-        while True:
-            try:
-                chunk = await self._value.read()
-                if not chunk:
-                    break
-                await writer.write(chunk)
-            except EofStream:
-                break
-
-
 class JsonPayload(BytesPayload):
 
     def __init__(self, value,
@@ -305,6 +282,3 @@ def __init__(self, value,
 PAYLOAD_REGISTRY.register(
     BufferedReaderPayload, (io.BufferedReader, io.BufferedRandom))
 PAYLOAD_REGISTRY.register(IOBasePayload, io.IOBase)
-PAYLOAD_REGISTRY.register(
-    StreamReaderPayload, (asyncio.StreamReader, StreamReader))
-PAYLOAD_REGISTRY.register(DataQueuePayload, DataQueue)

tests/test_client_functional.py

@@ -2481,24 +2481,3 @@ def connection_lost(self, exc):
     connector.close()
     server.close()
     await server.wait_closed()
-
-
-@pytest.mark.xfail
-async def test_stream_reader(test_client):
-    DATA = b'1234567890' * (2**16)
-
-    async def h1(request):
-        return web.Response(body=DATA)
-
-    async def h2(request):
-        async with aiohttp.ClientSession() as sess:
-            async with sess.get(client.make_url('/h1')) as resp:
-                return web.Response(body=resp.content)
-
-    app = web.Application()
-    app.router.add_get('/h1', h1)
-    app.router.add_get('/h2', h2)
-
-    client = await test_client(app)
-    resp = await client.get('/h2')
-    assert await resp.read() == DATA

tests/test_web_functional.py

@@ -1641,17 +1641,3 @@ async def handler(request):
 
     with pytest.warns(DeprecationWarning):
         await client.get('/')
-
-
-async def test_stream_reader(test_client):
-    DATA = b'1234567890' * (2**16)
-
-    async def handler(request):
-        return web.Response(body=request.content)
-
-    app = web.Application()
-    app.router.add_post('/', handler)
-
-    client = await test_client(app)
-    resp = await client.post('/', data=DATA)
-    assert await resp.read() == DATA