From 5e85066333e8d596befb0920fea813aaf8403656 Mon Sep 17 00:00:00 2001
From: Chris Malek <cmalek@caltech.edu>
Date: Tue, 2 Nov 2021 15:46:00 -0700
Subject: [PATCH] support aiohttp-3.8.0

This fixes the rename of aiohttp.web_routedef._SimpleHandler to aiohttp.typedefs.Handler while remaining backwards incompatible.   This also fixes the upcoming rename of aiohttp.web_app._Middleware to aiohttp.typedefs.Middleware.
---
 aiodogstatsd/contrib/aiohttp.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/aiodogstatsd/contrib/aiohttp.py b/aiodogstatsd/contrib/aiohttp.py
index 2eb9e43..7576cc8 100644
--- a/aiodogstatsd/contrib/aiohttp.py
+++ b/aiodogstatsd/contrib/aiohttp.py
@@ -2,8 +2,16 @@
 from typing import AsyncIterator, Callable, Optional, cast
 
 from aiohttp import web
-from aiohttp.web_app import _Middleware
-from aiohttp.web_routedef import _SimpleHandler
+try:
+    from aiohttp.typedefs import Middleware
+except ImportError:
+    # aiohttp < 3.8.0
+    from aiohttp.web_app import _Middleware as Middleware
+try:
+    from aiohttp.typedefs import Handler
+except ImportError:
+    # aiohttp < 3.8.0
+    from aiohttp.web_routedef import _SimpleHandler as Handler
 from aiohttp.web_urldispatcher import DynamicResource, MatchInfoError
 
 from aiodogstatsd import Client, typedefs
@@ -55,10 +63,10 @@ def middleware_factory(
     request_duration_metric_name: str = DEAFULT_REQUEST_DURATION_METRIC_NAME,
     collect_not_allowed: bool = False,
     collect_not_found: bool = False,
-) -> _Middleware:
+) -> Middleware:
     @web.middleware
     async def middleware(
-        request: web.Request, handler: _SimpleHandler
+        request: web.Request, handler: Handler
     ) -> web.StreamResponse:
         loop = get_event_loop()
         request_started_at = loop.time()