handle tuple returns from file dialog properly

nw/gui/build.py

@@ -762,12 +762,10 @@ class GuiBuildNovel(QDialog):
             if self.mainConf.showGUI:
                 dlgOpt  = QFileDialog.Options()
                 dlgOpt |= QFileDialog.DontUseNativeDialog
-                saveTo  = QFileDialog.getSaveFileName(
+                savePath, _ = QFileDialog.getSaveFileName(
                     self, "Save Document As", savePath, options=dlgOpt
                 )
-                if saveTo[0]:
+                if not savePath:
-                    savePath = saveTo[0]
-                else:
                     return False
 
             self.mainConf.setLastPath(savePath)

nw/gui/writingstats.py

@@ -334,12 +334,11 @@ class GuiWritingStats(QDialog):
 
             dlgOpt  = QFileDialog.Options()
             dlgOpt |= QFileDialog.DontUseNativeDialog
-            saveTo  = QFileDialog.getSaveFileName(
+            savePath, _ = QFileDialog.getSaveFileName(
                 self, "Save Document As", savePath, options=dlgOpt
             )
-            if saveTo[0]:
+
-                savePath = saveTo[0]
+            if not savePath:
-            else:
                 return False
 
             self.mainConf.setLastPath(savePath)

nw/guimain.py

@@ -562,12 +562,10 @@ class GuiMain(QMainWindow):
         ]
         dlgOpt  = QFileDialog.Options()
         dlgOpt |= QFileDialog.DontUseNativeDialog
-        inPath  = QFileDialog.getOpenFileName(
+        loadFile, _ = QFileDialog.getOpenFileName(
             self, "Import File", lastPath, options=dlgOpt, filter=";;".join(extFilter)
         )
-        if inPath:
+        if not loadFile:
-            loadFile = inPath[0]
-        else:
             return False
 
         if loadFile.strip() == "":

tests/test_dialogs.py

@@ -283,10 +283,10 @@ def testWritingStatsExport(qtbot, monkeypatch, yesToAll, nwFuncTemp, nwTemp):
     assert isinstance(sessLog, GuiWritingStats)
     qtbot.wait(stepDelay)
 
-    monkeypatch.setattr(QFileDialog, "getSaveFileName", lambda *args, **kwargs: [])
+    monkeypatch.setattr(QFileDialog, "getSaveFileName", lambda *args, **kwargs: ("", ""))
     assert not sessLog._saveData(sessLog.FMT_CSV)
 
-    monkeypatch.setattr(QFileDialog, "getSaveFileName", lambda ss, tt, pp, options: [pp])
+    monkeypatch.setattr(QFileDialog, "getSaveFileName", lambda ss, tt, pp, options: (pp, ""))
     assert sessLog._saveData(sessLog.FMT_CSV)
     qtbot.wait(stepDelay)
     assert sessLog._saveData(sessLog.FMT_JSON)

tests/test_gui.py

@@ -1107,16 +1107,16 @@ def testInsertMenu(qtbot, monkeypatch, nwFuncTemp, nwTemp):
     nwGUI.closeDocument()
 
     # First, with no path
-    monkeypatch.setattr(QFileDialog, "getOpenFileName", lambda *args, **kwards: [])
+    monkeypatch.setattr(QFileDialog, "getOpenFileName", lambda *args, **kwards: ("", ""))
     assert not nwGUI.importDocument()
 
     # Then with a path, but an invalid one
-    monkeypatch.setattr(QFileDialog, "getOpenFileName", lambda *args, **kwards: [" "])
+    monkeypatch.setattr(QFileDialog, "getOpenFileName", lambda *args, **kwards: (" ", ""))
     assert not nwGUI.importDocument()
 
     # Then a valid path, but bot a file that exists
     theFile = os.path.join(nwTemp, "import.txt")
-    monkeypatch.setattr(QFileDialog, "getOpenFileName", lambda *args, **kwards: [theFile])
+    monkeypatch.setattr(QFileDialog, "getOpenFileName", lambda *args, **kwards: (theFile, ""))
     assert not nwGUI.importDocument()
 
     # Create the file and try again, but with no target document open