Using web.Request instead of importing Request from web_request

aio-libs · Nov 18, 2020 · 9f08ad1 · 9f08ad1
1 parent 96d525c
commit 9f08ad1
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 33 deletions.
diff --git a/examples/background_tasks.py b/examples/background_tasks.py
@@ -5,10 +5,9 @@
 import aioredis  # type: ignore
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 
-async def websocket_handler(request: Request) -> web.StreamResponse:
+async def websocket_handler(request: web.Request) -> web.StreamResponse:
     ws = web.WebSocketResponse()
     await ws.prepare(request)
     request.app["websockets"].append(ws)

diff --git a/examples/cli_app.py b/examples/cli_app.py
@@ -17,10 +17,9 @@
 from typing import Optional, Sequence
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 
-async def display_message(req: Request) -> web.StreamResponse:
+async def display_message(req: web.Request) -> web.StreamResponse:
     args = req.app["args"]
     text = "\n".join([args.message] * args.repeat)
     return web.Response(text=text)

diff --git a/examples/fake_server.py b/examples/fake_server.py
@@ -10,7 +10,6 @@
 from aiohttp.abc import AbstractResolver
 from aiohttp.resolver import DefaultResolver
 from aiohttp.test_utils import unused_port
-from aiohttp.web_request import Request
 
 
 class FakeResolver:
@@ -73,10 +72,10 @@ async def start(self) -> Dict[str, int]:
     async def stop(self) -> None:
         await self.runner.cleanup()
 
-    async def on_me(self, request: Request) -> web.StreamResponse:
+    async def on_me(self, request: web.Request) -> web.StreamResponse:
         return web.json_response({"name": "John Doe", "id": "12345678901234567"})
 
-    async def on_my_friends(self, request: Request) -> web.StreamResponse:
+    async def on_my_friends(self, request: web.Request) -> web.StreamResponse:
         return web.json_response(
             {
                 "data": [

diff --git a/examples/server_simple.py b/examples/server_simple.py
@@ -1,15 +1,14 @@
 # server_simple.py
 from aiohttp import web
-from aiohttp.web_request import Request
 
 
-async def handle(request: Request) -> web.StreamResponse:
+async def handle(request: web.Request) -> web.StreamResponse:
     name = request.match_info.get("name", "Anonymous")
     text = "Hello, " + name
     return web.Response(text=text)
 
 
-async def wshandle(request: Request) -> web.StreamResponse:
+async def wshandle(request: web.Request) -> web.StreamResponse:
     ws = web.WebSocketResponse()
     await ws.prepare(request)
 

diff --git a/examples/web_classview.py b/examples/web_classview.py
@@ -6,7 +6,6 @@
 import json
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 
 class MyView(web.View):
@@ -33,7 +32,7 @@ async def post(self) -> web.StreamResponse:
         )
 
 
-async def index(request: Request) -> web.StreamResponse:
+async def index(request: web.Request) -> web.StreamResponse:
     txt = """
       <html>
         <head>

diff --git a/examples/web_cookies.py b/examples/web_cookies.py
@@ -5,7 +5,6 @@
 from pprint import pformat
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 tmpl = """\
 <html>
@@ -17,19 +16,19 @@
 </html>"""
 
 
-async def root(request: Request) -> web.StreamResponse:
+async def root(request: web.Request) -> web.StreamResponse:
     resp = web.Response(content_type="text/html")
     resp.text = tmpl.format(pformat(request.cookies))
     return resp
 
 
-async def login(request: Request) -> None:
+async def login(request: web.Request) -> None:
     exc = web.HTTPFound(location="/")
     exc.set_cookie("AUTH", "secret")
     raise exc
 
 
-async def logout(request: Request) -> None:
+async def logout(request: web.Request) -> None:
     exc = web.HTTPFound(location="/")
     exc.del_cookie("AUTH")
     raise exc

diff --git a/examples/web_srv.py b/examples/web_srv.py
@@ -5,10 +5,9 @@
 import textwrap
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 
-async def intro(request: Request) -> web.StreamResponse:
+async def intro(request: web.Request) -> web.StreamResponse:
     txt = textwrap.dedent(
         """\
         Type {url}/hello/John  {url}/simple or {url}/change_body
@@ -24,18 +23,18 @@ async def intro(request: Request) -> web.StreamResponse:
     return resp
 
 
-async def simple(request: Request) -> web.StreamResponse:
+async def simple(request: web.Request) -> web.StreamResponse:
     return web.Response(text="Simple answer")
 
 
-async def change_body(request: Request) -> web.StreamResponse:
+async def change_body(request: web.Request) -> web.StreamResponse:
     resp = web.Response()
     resp.body = b"Body changed"
     resp.content_type = "text/plain"
     return resp
 
 
-async def hello(request: Request) -> web.StreamResponse:
+async def hello(request: web.Request) -> web.StreamResponse:
     resp = web.StreamResponse()
     name = request.match_info.get("name", "Anonymous")
     answer = ("Hello, " + name).encode("utf8")

diff --git a/examples/web_srv_route_deco.py b/examples/web_srv_route_deco.py
@@ -6,13 +6,12 @@
 import textwrap
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 routes = web.RouteTableDef()
 
 
 @routes.get("/")
-async def intro(request: Request) -> web.StreamResponse:
+async def intro(request: web.Request) -> web.StreamResponse:
     txt = textwrap.dedent(
         """\
         Type {url}/hello/John  {url}/simple or {url}/change_body
@@ -29,20 +28,21 @@ async def intro(request: Request) -> web.StreamResponse:
 
 
 @routes.get("/simple")
-async def simple(request: Request) -> web.StreamResponse:
+async def simple(request: web.Request) -> web.StreamResponse:
     return web.Response(text="Simple answer")
 
 
+@routes.get('/change_body')
 @routes.get("/change_body")
-async def change_body(request: Request) -> web.StreamResponse:
+async def change_body(request: web.Request) -> web.StreamResponse:
     resp = web.Response()
     resp.body = b"Body changed"
     resp.content_type = "text/plain"
     return resp
 
 
 @routes.get("/hello")
-async def hello(request: Request) -> web.StreamResponse:
+async def hello(request: web.Request) -> web.StreamResponse:
     resp = web.StreamResponse()
     name = request.match_info.get("name", "Anonymous")
     answer = ("Hello, " + name).encode("utf8")

diff --git a/examples/web_srv_route_table.py b/examples/web_srv_route_table.py
@@ -6,10 +6,9 @@
 import textwrap
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 
-async def intro(request: Request) -> web.StreamResponse:
+async def intro(request: web.Request) -> web.StreamResponse:
     txt = textwrap.dedent(
         """\
         Type {url}/hello/John  {url}/simple or {url}/change_body
@@ -25,18 +24,18 @@ async def intro(request: Request) -> web.StreamResponse:
     return resp
 
 
-async def simple(request: Request) -> web.StreamResponse:
+async def simple(request: web.Request) -> web.StreamResponse:
     return web.Response(text="Simple answer")
 
 
-async def change_body(request: Request) -> web.StreamResponse:
+async def change_body(request: web.Request) -> web.StreamResponse:
     resp = web.Response()
     resp.body = b"Body changed"
     resp.content_type = "text/plain"
     return resp
 
 
-async def hello(request: Request) -> web.StreamResponse:
+async def hello(request: web.Request) -> web.StreamResponse:
     resp = web.StreamResponse()
     name = request.match_info.get("name", "Anonymous")
     answer = ("Hello, " + name).encode("utf8")

diff --git a/examples/web_ws.py b/examples/web_ws.py
@@ -6,12 +6,11 @@
 from typing import Union
 
 from aiohttp import web
-from aiohttp.web_request import Request
 
 WS_FILE = os.path.join(os.path.dirname(__file__), "websocket.html")
 
 
-async def wshandler(request: Request) -> Union[web.WebSocketResponse, web.Response]:
+async def wshandler(request: web.Request) -> Union[web.WebSocketResponse, web.Response]:
     resp = web.WebSocketResponse()
     available = resp.can_prepare(request)
     if not available: