Replace exec_ with exec

tests/test_gui/test_gui_doceditor.py

@@ -244,7 +244,7 @@ def testGuiEditor_MetaData(qtbot, nwGUI, projPath, mockRnd):
 @pytest.mark.gui
 def testGuiEditor_ContextMenu(monkeypatch, qtbot, nwGUI, projPath, mockRnd):
     """Test the editor context menu."""
-    monkeypatch.setattr(QMenu, "exec_", lambda *a: None)
+    monkeypatch.setattr(QMenu, "exec", lambda *a: None)
 
     buildTestProject(nwGUI, projPath)
     assert nwGUI.openDocument(C.hSceneDoc) is True

tests/test_gui/test_gui_docviewer.py

@@ -146,7 +146,7 @@ def testGuiViewer_Main(qtbot, monkeypatch, nwGUI, prjLipsum):
     docViewer.setTextCursor(cursor)
     docViewer._makeSelection(QTextCursor.WordUnderCursor)
     with monkeypatch.context() as mp:
-        mp.setattr(QMenu, "exec_", mockExec)
+        mp.setattr(QMenu, "exec", mockExec)
         docViewer._openContextMenu(docViewer.cursorRect().center())
         assert menuOpened
 

tests/test_gui/test_gui_guimain.py

@@ -60,7 +60,7 @@ def testGuiMain_ProjectBlocker(nwGUI):
 @pytest.mark.gui
 def testGuiMain_Launch(qtbot, monkeypatch, nwGUI, projPath):
     """Test the handling of launch tasks."""
-    monkeypatch.setattr(GuiWelcome, "exec_", lambda *a: None)
+    monkeypatch.setattr(GuiWelcome, "exec", lambda *a: None)
     CONFIG.lastNotes = "0x0"
     buildTestProject(nwGUI, projPath)
 
@@ -511,7 +511,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd):
         assert "test" in suggest
 
     with monkeypatch.context() as mp:
-        mp.setattr(QMenu, "exec_", lambda *a: None)
+        mp.setattr(QMenu, "exec", lambda *a: None)
         docEditor.setCursorPosition(errPos)
         docEditor._openContextFromCursor()
 

tests/test_gui/test_gui_i18n.py

@@ -47,8 +47,8 @@ LANG_DATA = CONFIG.listLanguages(CONFIG.LANG_NW)
 @pytest.mark.parametrize("language", [a for a, b in LANG_DATA])
 def testGuiI18n_Localisation(qtbot, monkeypatch, language, nwGUI, projPath):
     """Test loading the gui with a specific language."""
-    monkeypatch.setattr(QDialog, "exec_", lambda *a: None)
-    monkeypatch.setattr(QMessageBox, "exec_", lambda *a: None)
+    monkeypatch.setattr(QDialog, "exec", lambda *a: None)
+    monkeypatch.setattr(QMessageBox, "exec", lambda *a: None)
     monkeypatch.setattr(QMessageBox, "result", lambda *a: QMessageBox.Yes)
 
     # Set the test language

tests/test_gui/test_gui_projtree.py

@@ -539,7 +539,7 @@ def testGuiProjTree_MergeDocuments(qtbot, monkeypatch, nwGUI, projPath, mockRnd,
     mergeData = {}
 
     monkeypatch.setattr(GuiDocMerge, "__init__", lambda *a: None)
-    monkeypatch.setattr(GuiDocMerge, "exec_", lambda *a: None)
+    monkeypatch.setattr(GuiDocMerge, "exec", lambda *a: None)
     monkeypatch.setattr(GuiDocMerge, "result", lambda *a: QDialog.Accepted)
     monkeypatch.setattr(GuiDocMerge, "getData", lambda *a: mergeData)
 
@@ -640,7 +640,7 @@ def testGuiProjTree_SplitDocument(qtbot, monkeypatch, nwGUI, projPath, mockRnd,
     splitText = []
 
     monkeypatch.setattr(GuiDocSplit, "__init__", lambda *a: None)
-    monkeypatch.setattr(GuiDocSplit, "exec_", lambda *a: None)
+    monkeypatch.setattr(GuiDocSplit, "exec", lambda *a: None)
     monkeypatch.setattr(GuiDocSplit, "result", lambda *a: QDialog.Accepted)
     monkeypatch.setattr(GuiDocSplit, "getData", lambda *a: (splitData, splitText))
 
@@ -1162,7 +1162,7 @@ def testGuiProjTree_ContextMenu(qtbot, monkeypatch, nwGUI, projPath, mockRnd):
 
     # Pop the menu
     with monkeypatch.context() as mp:
-        mp.setattr(QMenu, "exec_", lambda *a: None)
+        mp.setattr(QMenu, "exec", lambda *a: None)
         projTree.clearSelection()
 
         # No item under menu