Improve accuracy of subapp resource types (#8364)

aio-libs · Apr 20, 2024 · 0e4a5c3 · 0e4a5c3
1 parent 9b6f2c0
commit 0e4a5c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES/8364.misc.rst b/CHANGES/8364.misc.rst
@@ -0,0 +1 @@
+Minor improvements to static typing -- by :user:`Dreamsorcerer`.
diff --git a/aiohttp/web_app.py b/aiohttp/web_app.py
@@ -66,6 +66,7 @@
 
 _T = TypeVar("_T")
 _U = TypeVar("_U")
+_Resource = TypeVar("_Resource", bound=AbstractResource)
 
 
 @final
@@ -270,7 +271,7 @@ async def handler(app: "Application") -> None:
         reg_handler("on_shutdown")
         reg_handler("on_cleanup")
 
-    def add_subapp(self, prefix: str, subapp: "Application") -> AbstractResource:
+    def add_subapp(self, prefix: str, subapp: "Application") -> PrefixedSubAppResource:
         if not isinstance(prefix, str):
             raise TypeError("Prefix must be str")
         prefix = prefix.rstrip("/")
@@ -280,8 +281,8 @@ def add_subapp(self, prefix: str, subapp: "Application") -> AbstractResource:
         return self._add_subapp(factory, subapp)
 
     def _add_subapp(
-        self, resource_factory: Callable[[], AbstractResource], subapp: "Application"
-    ) -> AbstractResource:
+        self, resource_factory: Callable[[], _Resource], subapp: "Application"
+    ) -> _Resource:
         if self.frozen:
             raise RuntimeError("Cannot add sub application to frozen application")
         if subapp.frozen:
@@ -293,7 +294,7 @@ def _add_subapp(
         subapp.pre_freeze()
         return resource
 
-    def add_domain(self, domain: str, subapp: "Application") -> AbstractResource:
+    def add_domain(self, domain: str, subapp: "Application") -> MatchedSubAppResource:
         if not isinstance(domain, str):
             raise TypeError("Domain must be str")
         elif "*" in domain: