Use exec instead of exec_ where possible for Qt (#1208)

This uses `hasattr` to test whether `exec` is available, which should be all Qt backends except PySide2.

Fixes #1179

pyface/ui/qt4/code_editor/code_widget.py

@@ -839,4 +839,7 @@ def set_trace():
 
     window.resize(640, 640)
     window.show()
-    sys.exit(app.exec_())
+    if hasattr(app, "exec"):
+        sys.exit(app.exec())
+    else:
+        sys.exit(app.exec_())

pyface/ui/qt4/confirmation_dialog.py

@@ -53,9 +53,7 @@ class ConfirmationDialog(MConfirmationDialog, Dialog):
 
     # If we create custom buttons with the various roles, then we need to
     # keep track of the buttons so we can see what the user clicked.  It's
-    # not correct nor sufficient to check the return result from QMessageBox.exec_().
-    # (As of Qt 4.5.1, even clicking a button with the YesRole would lead to
-    # exec_() returning QDialog.DialogCode.Rejected.
+    # not correct nor sufficient to check the return result from QMessageBox.exec().
     _button_result_map = Dict()
 
     # ------------------------------------------------------------------------
@@ -127,7 +125,10 @@ def _create_control(self, parent):
 
     def _show_modal(self):
         self.control.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
-        retval = self.control.exec_()
+        if hasattr(self.control, "exec"):
+            retval = self.control.exec()
+        else:
+            retval = self.control.exec_()
         if self.control is None:
             # dialog window closed
             if self.cancel:

pyface/ui/qt4/console/console_widget.py

@@ -597,7 +597,12 @@ def print_(self, printer=None):
         """
         if not printer:
             printer = QtGui.QPrinter()
-            if QtGui.QPrintDialog(printer).exec_() != QtGui.QDialog.DialogCode.Accepted:
+            dialog = QtGui.QPrintDialog(printer)
+            if hasattr(dialog, "exec"):
+                result = dialog.exec()
+            else:
+                result = dialog.exec_()
+            if result != QtGui.QDialog.DialogCode.Accepted:
                 return
         self._control.print_(printer)
 
@@ -616,7 +621,11 @@ def export(self, parent=None):
             root, ext = os.path.splitext(self._filename)
             if ext.lower() in (".xml", ".xhtml"):
                 dialog.selectNameFilter(filters[-1])
-        if dialog.exec_():
+        if hasattr(dialog, "exec"):
+            result = dialog.exec()
+        else:
+            result = dialog.exec_()
+        if result:
             filename = str(dialog.selectedFiles()[0])
             self._filename = filename
             choice = str(dialog.selectedNameFilter())
@@ -688,8 +697,11 @@ def export_html(self, filename):
             layout.addWidget(checkbox)
             widget.setLayout(layout)
             widget.show()
-            reply = box.exec_()
-            inline = reply == 0
+            if hasattr(box, "exec"):
+                reply = box.exec()
+            else:
+                reply = box.exec_()
+            inline = (reply == 0)
             if checkbox.checkState():
                 # don't ask anymore, always use this choice
                 if inline:
@@ -2029,4 +2041,7 @@ def _custom_context_menu_requested(self, pos):
         """ Shows a context menu at the given QPoint (in widget coordinates).
         """
         menu = self._context_menu_make(pos)
-        menu.exec_(self._control.mapToGlobal(pos))
+        if hasattr(menu, "exec"):
+            menu.exec(self._control.mapToGlobal(pos))
+        else:
+            menu.exec_(self._control.mapToGlobal(pos))

pyface/ui/qt4/dialog.py

@@ -145,7 +145,10 @@ def _show_modal(self):
             dialog.windowFlags() & ~QtCore.Qt.WindowType.WindowContextHelpButtonHint
         )
 
-        retval = dialog.exec_()
+        if hasattr(self.control, "exec"):
+            retval = self.control.exec()
+        else:
+            retval = self.control.exec_()
         return _RESULT_MAP[retval]
 
     # -------------------------------------------------------------------------

pyface/ui/qt4/single_choice_dialog.py

@@ -60,7 +60,10 @@ def _create_contents(self, parent):
 
     def _show_modal(self):
         self.control.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
-        retval = self.control.exec_()
+        if hasattr(self.control, 'exec'):
+            retval = self.control.exec()
+        else:
+            retval = self.control.exec_()
         if self.control is None:
             # dialog window closed, treat as Cancel, nullify choice
             retval = CANCEL

pyface/ui/qt4/tasks/split_editor_area_pane.py

@@ -952,7 +952,10 @@ def contextMenuEvent(self, event):
             menu = self.editor_area.get_context_menu(pos=global_pos)
             if menu is not None:
                 qmenu = menu.create_menu(self)
-                qmenu.exec_(global_pos)
+                if hasattr(qmenu, 'exec'):
+                    qmenu.exec(global_pos)
+                else:
+                    qmenu.exec_(global_pos)
 
     def dragEnterEvent(self, event):
         """ Re-implemented to highlight the tabwidget on drag enter
@@ -1026,7 +1029,10 @@ def mouseMoveEvent(self, event):
                 drag.setPixmap(self.drag_obj.get_pixmap())
                 drag.setHotSpot(self.drag_obj.get_hotspot())
                 drag.setMimeData(mimedata)
-                drag.exec_()
+                if hasattr(drag, 'exec'):
+                    drag.exec()
+                else:
+                    drag.exec_()
                 self.drag_obj = None  # deactivate the drag_obj again
                 return
         return super().mouseMoveEvent(event)

pyface/ui/qt4/util/event_loop_helper.py

@@ -160,7 +160,10 @@ def do_timeout():
             timeout_timer.start()
             condition_timer.start()
             try:
-                self.qt_app.exec_()
+                if hasattr(self.qt_app, 'exec'):
+                    self.qt_app.exec()
+                else:
+                    self.qt_app.exec_()
                 if not condition_result:
                     if condition_result is None:
                         status = "without evaluating condition"
@@ -203,7 +206,10 @@ def delete_widget(self, widget, timeout=1.0):
         widget.destroyed.connect(self.qt_app.quit)
         yield
         timer.start()
-        self.qt_app.exec_()
+        if hasattr(self.qt_app, 'exec'):
+            self.qt_app.exec()
+        else:
+            self.qt_app.exec_()
         if not timer.isActive():
             # We exited the event loop on timeout
             raise ConditionTimeoutError(

pyface/ui/qt4/util/testing.py

@@ -48,7 +48,10 @@ def delete_widget(widget, timeout=1.0):
     yield
 
     timer.start()
-    app.exec_()
+    if hasattr(app, 'exec'):
+        app.exec()
+    else:
+        app.exec_()
 
     if not timer.isActive():
         # We exited the event loop on timeout.

pyface/util/guisupport.py

@@ -152,7 +152,10 @@ def start_event_loop_qt4(app=None):
         app = get_app_qt4([""])
     if not is_event_loop_running_qt4(app):
         app._in_event_loop = True
-        app.exec_()
+        if hasattr(app, 'exec'):
+            app.exec()
+        else:
+            app.exec_()
         app._in_event_loop = False
     else:
         app._in_event_loop = True