Merge pull request #396 from bluetech/un-result-fixup

callers: do `.close()` also in the `throw` case
pytest-dev · Jun 17, 2023 · 054a787 · 054a787
2 parents 40fbab1 + efe096a
commit 054a787
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/pluggy/_callers.py b/src/pluggy/_callers.py
@@ -104,10 +104,10 @@ def _multicall(
                         teardown.throw(outcome._exception)
                     else:
                         teardown.send(outcome._result)
-                        # Following is unreachable for a well behaved hook wrapper.
-                        # Try to force finalizers otherwise postponed till GC action.
-                        # Note: close() may raise if generator handles GeneratorExit.
-                        teardown.close()
+                    # Following is unreachable for a well behaved hook wrapper.
+                    # Try to force finalizers otherwise postponed till GC action.
+                    # Note: close() may raise if generator handles GeneratorExit.
+                    teardown.close()
                 except StopIteration as si:
                     outcome.force_result(si.value)
                     continue