Replace AbstractMatchInfo with UrlMappingMatchInfo.

CHANGES/4748.bugfix

@@ -0,0 +1 @@
+Change return type on URLDispatcher to UrlMappingMatchInfo to improve type annotations.

aiohttp/web_app.py

@@ -332,7 +332,7 @@ async def _handle(self, request: Request) -> StreamResponse:
         match_info.freeze()
 
         resp = None
-        request._match_info = match_info  # type: ignore[assignment]
+        request._match_info = match_info
         expect = request.headers.get(hdrs.EXPECT)
         if expect:
             resp = await match_info.expect_handler(request)

aiohttp/web_middlewares.py

@@ -23,7 +23,7 @@ async def _check_request_resolves(request: Request, path: str) -> Tuple[bool, Re
     alt_request = request.clone(rel_url=path)
 
     match_info = await request.app.router.resolve(alt_request)
-    alt_request._match_info = match_info  # type: ignore[assignment]
+    alt_request._match_info = match_info
 
     if match_info.http_exception is None:
         return True, alt_request

aiohttp/web_urldispatcher.py

@@ -82,7 +82,7 @@
 
 
 _ExpectHandler = Callable[[Request], Awaitable[None]]
-_Resolve = Tuple[Optional[AbstractMatchInfo], Set[str]]
+_Resolve = Tuple[Optional["UrlMappingMatchInfo"], Set[str]]
 
 
 class _InfoDict(TypedDict, total=False):
@@ -982,7 +982,7 @@ def __init__(self) -> None:
         self._resources = []  # type: List[AbstractResource]
         self._named_resources = {}  # type: Dict[str, AbstractResource]
 
-    async def resolve(self, request: Request) -> AbstractMatchInfo:
+    async def resolve(self, request: Request) -> UrlMappingMatchInfo:
         method = request.method
         allowed_methods = set()  # type: Set[str]
 
@@ -992,11 +992,11 @@ async def resolve(self, request: Request) -> AbstractMatchInfo:
                 return match_dict
             else:
                 allowed_methods |= allowed
+
+        if allowed_methods:
+            return MatchInfoError(HTTPMethodNotAllowed(method, allowed_methods))
         else:
-            if allowed_methods:
-                return MatchInfoError(HTTPMethodNotAllowed(method, allowed_methods))
-            else:
-                return MatchInfoError(HTTPNotFound())
+            return MatchInfoError(HTTPNotFound())
 
     def __iter__(self) -> Iterator[str]:
         return iter(self._named_resources)

requirements/test.txt

@@ -1,4 +1,3 @@
-
 -r base.txt
 Brotli==1.0.9
 coverage==6.0.2