Skip to content

Commit 6baa9e7

Browse files
committed
split web_reqrep.py
1 parent b0019e5 commit 6baa9e7

10 files changed

+524
-516
lines changed

aiohttp/file_sender.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from .helpers import create_future
77
from .web_exceptions import (HTTPNotModified, HTTPOk, HTTPPartialContent,
88
HTTPRequestRangeNotSatisfiable)
9-
from .web_reqrep import StreamResponse
9+
from .web_response import StreamResponse
1010

1111

1212
class FileSender:

aiohttp/web.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,24 @@
1010

1111
from yarl import URL
1212

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)
1515
from .abc import AbstractMatchInfo, AbstractRouter
1616
from .helpers import FrozenList, sentinel
1717
from .http import HttpVersion # noqa
1818
from .log import access_logger, web_logger
1919
from .signals import PostSignal, PreSignal, Signal
2020
from .web_exceptions import * # noqa
2121
from .web_middlewares import * # noqa
22-
from .web_reqrep import * # noqa
22+
from .web_request import * # noqa
23+
from .web_response import * # noqa
2324
from .web_server import Server
2425
from .web_urldispatcher import * # noqa
2526
from .web_urldispatcher import PrefixedSubAppResource
2627
from .web_ws import * # noqa
2728

28-
__all__ = (web_reqrep.__all__ +
29+
__all__ = (web_request.__all__ +
30+
web_response.__all__ +
2931
web_exceptions.__all__ +
3032
web_urldispatcher.__all__ +
3133
web_ws.__all__ +
@@ -235,7 +237,7 @@ def cleanup(self):
235237
yield from self.on_cleanup.send(self)
236238

237239
def _make_request(self, message, payload, protocol,
238-
_cls=web_reqrep.Request):
240+
_cls=web_request.Request):
239241
return _cls(
240242
message, payload, protocol,
241243
protocol._time_service, protocol._request_handler,
@@ -266,7 +268,7 @@ def _handle(self, request):
266268
handler = yield from factory(app, handler)
267269
resp = yield from handler(request)
268270

269-
assert isinstance(resp, web_reqrep.StreamResponse), \
271+
assert isinstance(resp, web_response.StreamResponse), \
270272
("Handler {!r} should return response instance, "
271273
"got {!r} [middlewares {!r}]").format(
272274
match_info.handler, type(resp),

aiohttp/web_exceptions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .web_reqrep import Response
1+
from .web_response import Response
22

33
__all__ = (
44
'HTTPException',

0 commit comments

Comments
 (0)