Fix loop scope closures

aio-libs/aiohttp#1925 (comment)
athenianco · Jun 5, 2020 · 91af09f · 91af09f
1 parent aa0d4c0
commit 91af09f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/server/athenian/api/auth.py b/server/athenian/api/auth.py
@@ -145,17 +145,15 @@ async def close(self):
                     if proto is None:
                         continue
                     transports += 1
-                    orig_lost = proto.connection_lost
-                    orig_eof_received = proto.eof_received
 
-                    def connection_lost(exc):
+                    def connection_lost(orig_lost, exc):
                         orig_lost(exc)
                         nonlocal transports
                         transports -= 1
                         if transports == 0:
                             all_is_lost.set()
 
-                    def eof_received():
+                    def eof_received(orig_eof_received):
                         try:
                             orig_eof_received()
                         except AttributeError:
@@ -164,8 +162,9 @@ def eof_received():
                             # Jeez, asyncio sucks sometimes.
                             pass
 
-                    proto.connection_lost = connection_lost
-                    proto.eof_received = eof_received
+                    proto.connection_lost = functools.partial(
+                        connection_lost, proto.connection_lost)
+                    proto.eof_received = functools.partial(eof_received, proto.eof_received)
         await session.close()
         if transports > 0:
             await all_is_lost.wait()