Use (a)closing

Author: agronholm

Lib/contextlib.py

@@ -87,7 +87,7 @@ def inner(*args, **kwds):
                 return func(*args, **kwds)
 
         def gen_inner(*args, **kwds):
-            with self._recreate_cm(), func(*args, **kwds) as gen:
+            with self._recreate_cm(), closing(func(*args, **kwds)) as gen:
                 yield from gen
 
         async def async_inner(*args, **kwds):
@@ -96,7 +96,7 @@ async def async_inner(*args, **kwds):
 
         async def asyncgen_inner(*args, **kwds):
             with self._recreate_cm():
-                async with func(*args, **kwds) as gen:
+                async with aclosing(func(*args, **kwds)) as gen:
                     async for value in gen:
                         yield value
 
@@ -126,16 +126,19 @@ async def inner(*args, **kwds):
 
         async def gen_inner(*args, **kwds):
             async with self._recreate_cm():
-                with func(*args, **kwds) as gen:
-                    for value in func(*args, **kwds):
+                with closing(func(*args, **kwds)) as gen:
+                    for value in gen:
                         yield value
 
         async def async_inner(*args, **kwds):
             async with self._recreate_cm():
                 return await func(*args, **kwds)
 
         async def asyncgen_inner(*args, **kwds):
-            async with self._recreate_cm(), func(*args, **kwds) as gen:
+            async with (
+                self._recreate_cm(),
+                aclosing(func(*args, **kwds)) as gen
+            ):
                 async for value in gen:
                     yield value