commit 25719964a8ee6bb56b86c0da1fad1e86e73da2a7
author Rob Mohr <mohrr@google.com> Tue Jan 17 20:11:19 2023 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jan 17 20:11:19 2023 +0000
tree d14bdffb946e16b96165ce526174c94a48cc8250
parent d5f87c8080f72c2f7fe882c62e039f0b8227a8cd

pw_presubmit: Use AbstractContextManager

Compare objects against contextlib.AbstractContextManager instead of
checking for methods like '__enter__'.

Bug: b/253021172
Change-Id: Ia6135df68e3fa91ba7be004f62b45d5401dcc784
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/126194
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>

pw_presubmit/py/pw_presubmit/build.py

diff --git a/pw_presubmit/py/pw_presubmit/build.py b/pw_presubmit/py/pw_presubmit/build.py
index 6280a8c..5feb6fc 100644
--- a/pw_presubmit/py/pw_presubmit/build.py
+++ b/pw_presubmit/py/pw_presubmit/build.py
@@ -594,11 +594,8 @@
     ) -> PresubmitResult:
         with contextlib.ExitStack() as stack:
             for mgr in self.ninja_contexts:
-                # hasattr(x, '__enter__') can return True for types, so
-                # explicitly exclude them. Only non-type objects can be
-                # context managers.
-                if hasattr(mgr, '__enter__') and not isinstance(mgr, type):
-                    stack.enter_context(mgr)  # type: ignore
+                if isinstance(mgr, contextlib.AbstractContextManager):
+                    stack.enter_context(mgr)
                 else:
                     stack.enter_context(mgr(ctx))  # type: ignore
             ninja(ctx, *targets)