BUG: Safe hasattr for PyQt5 (#1161)

* BUG: Safe hasattr for PyQt5 * Update pyface/ui/qt4/action/action_item.py * MAINT: Timeout Co-authored-by: Corran Webster <cwebster@enthought.com>
enthought · Oct 12, 2022 · 608e153 · 608e153
1 parent 038d55d
commit 608e153
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml
@@ -18,6 +18,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         toolkit: ['wx', 'pyqt5', 'pyside2', 'pyside6']
+    timeout-minutes: 20  # should be plenty, it's usually < 5
     runs-on: ${{ matrix.os }}
     env:
       # Set root directory, mainly for Windows, so that the EDM Python

diff --git a/pyface/ui/qt4/action/action_item.py b/pyface/ui/qt4/action/action_item.py
@@ -376,7 +376,12 @@ def _qt4_on_destroyed(self, control=None):
         """
         if self.control is not None:
             # Remove the cycle since we're no longer needed.
-            if hasattr(self.control, "_tool_instance"):
+            try:
+                has_instance = hasattr(self.control, "_tool_instance")
+            # fixes mayavi #1180: PyQt5 "wrapped C/C++ object ... has been deleted"
+            except RuntimeError:
+                has_instance = False
+            if has_instance:
                 del self.control._tool_instance
         self.control = None