|
10 | 10 |
|
11 | 11 | from yarl import URL
|
12 | 12 |
|
13 |
| -from . import (hdrs, web_exceptions, web_middlewares, web_reqrep, web_server, |
14 |
| - web_urldispatcher, web_ws) |
| 13 | +from . import (hdrs, web_exceptions, web_middlewares, web_request, |
| 14 | + web_response, web_server, web_urldispatcher, web_ws) |
15 | 15 | from .abc import AbstractMatchInfo, AbstractRouter
|
16 | 16 | from .helpers import FrozenList, sentinel
|
17 | 17 | from .http import HttpVersion # noqa
|
18 | 18 | from .log import access_logger, web_logger
|
19 | 19 | from .signals import PostSignal, PreSignal, Signal
|
20 | 20 | from .web_exceptions import * # noqa
|
21 | 21 | from .web_middlewares import * # noqa
|
22 |
| -from .web_reqrep import * # noqa |
| 22 | +from .web_request import * # noqa |
| 23 | +from .web_response import * # noqa |
23 | 24 | from .web_server import Server
|
24 | 25 | from .web_urldispatcher import * # noqa
|
25 | 26 | from .web_urldispatcher import PrefixedSubAppResource
|
26 | 27 | from .web_ws import * # noqa
|
27 | 28 |
|
28 |
| -__all__ = (web_reqrep.__all__ + |
| 29 | +__all__ = (web_request.__all__ + |
| 30 | + web_response.__all__ + |
29 | 31 | web_exceptions.__all__ +
|
30 | 32 | web_urldispatcher.__all__ +
|
31 | 33 | web_ws.__all__ +
|
@@ -235,7 +237,7 @@ def cleanup(self):
|
235 | 237 | yield from self.on_cleanup.send(self)
|
236 | 238 |
|
237 | 239 | def _make_request(self, message, payload, protocol,
|
238 |
| - _cls=web_reqrep.Request): |
| 240 | + _cls=web_request.Request): |
239 | 241 | return _cls(
|
240 | 242 | message, payload, protocol,
|
241 | 243 | protocol._time_service, protocol._request_handler,
|
@@ -266,7 +268,7 @@ def _handle(self, request):
|
266 | 268 | handler = yield from factory(app, handler)
|
267 | 269 | resp = yield from handler(request)
|
268 | 270 |
|
269 |
| - assert isinstance(resp, web_reqrep.StreamResponse), \ |
| 271 | + assert isinstance(resp, web_response.StreamResponse), \ |
270 | 272 | ("Handler {!r} should return response instance, "
|
271 | 273 | "got {!r} [middlewares {!r}]").format(
|
272 | 274 | match_info.handler, type(resp),
|
|
0 commit comments