Make sure we at least try to close the generators

Author: agronholm

Lib/contextlib.py

@@ -87,17 +87,18 @@ def inner(*args, **kwds):
                 return func(*args, **kwds)
 
         def gen_inner(*args, **kwds):
-            with self._recreate_cm():
-                yield from func(*args, **kwds)
+            with self._recreate_cm(), func(*args, **kwds) as gen:
+                yield from gen
 
         async def async_inner(*args, **kwds):
             with self._recreate_cm():
                 return await func(*args, **kwds)
 
         async def asyncgen_inner(*args, **kwds):
             with self._recreate_cm():
-                async for value in func(*args, **kwds):
-                    yield value
+                async with func(*args, **kwds) as gen:
+                    async for value in gen:
+                        yield value
 
         wrapper = wraps(func)
         if isasyncgenfunction(func):
@@ -125,16 +126,17 @@ async def inner(*args, **kwds):
 
         async def gen_inner(*args, **kwds):
             async with self._recreate_cm():
-                for value in func(*args, **kwds):
-                    yield value
+                with func(*args, **kwds) as gen:
+                    for value in func(*args, **kwds):
+                        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():
-                async for value in func(*args, **kwds):
+            async with self._recreate_cm(), func(*args, **kwds) as gen:
+                async for value in gen:
                     yield value
 
         wrapper = wraps(func)