Make all imports in tests explicit

tests/test_gui/test_gui_doceditor.py

@@ -27,10 +27,10 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QTextBlock, QTextCursor, QTextOption
 from PyQt5.QtWidgets import QAction, QMessageBox, qApp
 
-from novelwriter.gui.doceditor import GuiDocEditor
-from novelwriter.core import countWords
 from novelwriter.enum import nwDocAction, nwDocInsert, nwItemLayout
 from novelwriter.constants import nwKeyWords, nwUnicode
+from novelwriter.core.index import countWords
+from novelwriter.gui.doceditor import GuiDocEditor
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_docviewer.py

@@ -27,7 +27,7 @@ from PyQt5.QtWidgets import qApp, QAction, QMessageBox
 from mock import causeException
 
 from novelwriter.enum import nwDocAction
-from novelwriter.core import ToHtml
+from novelwriter.core.tohtml import ToHtml
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_guimain.py

@@ -28,11 +28,13 @@ from shutil import copyfile
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QMessageBox, QInputDialog
 
-from novelwriter.gui import GuiDocEditor, GuiNovelView, GuiOutlineView
 from novelwriter.enum import nwItemType, nwView, nwWidget
 from novelwriter.tools import GuiProjectWizard
 from novelwriter.dialogs import GuiEditLabel
+from novelwriter.gui.outline import GuiOutlineView
 from novelwriter.gui.projtree import GuiProjectTree
+from novelwriter.gui.doceditor import GuiDocEditor
+from novelwriter.gui.noveltree import GuiNovelView
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_mainmenu.py

@@ -28,9 +28,9 @@ from PyQt5.QtWidgets import QAction, QFileDialog, QMessageBox
 
 from tools import C, writeFile, buildTestProject
 
-from novelwriter.gui.doceditor import GuiDocEditor
 from novelwriter.enum import nwDocAction, nwDocInsert
 from novelwriter.constants import nwKeyWords, nwUnicode
+from novelwriter.gui.doceditor import GuiDocEditor
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_noveltree.py

@@ -29,8 +29,8 @@ from PyQt5.QtCore import Qt, QEvent
 from PyQt5.QtWidgets import QMessageBox, QToolTip
 
 from novelwriter.enum import nwWidget, nwItemType
-from novelwriter.dialogs import GuiEditLabel
 from novelwriter.gui.noveltree import NovelTreeColumn
+from novelwriter.dialogs.editlabel import GuiEditLabel
 
 
 @pytest.mark.gui

tests/test_gui/test_gui_projtree.py

@@ -30,8 +30,10 @@ from PyQt5.QtWidgets import QMessageBox, QMenu, QTreeWidgetItem, QDialog
 
 from novelwriter.enum import nwItemLayout, nwItemType, nwItemClass
 from novelwriter.core import NWDoc
-from novelwriter.dialogs import GuiEditLabel, GuiDocMerge, GuiDocSplit
 from novelwriter.gui.projtree import GuiProjectTree
+from novelwriter.dialogs.docmerge import GuiDocMerge
+from novelwriter.dialogs.docsplit import GuiDocSplit
+from novelwriter.dialogs.editlabel import GuiEditLabel
 
 
 @pytest.mark.gui

tests/test_gui/test_gui_statusbar.py

@@ -26,8 +26,8 @@ from tools import C, buildTestProject
 
 from PyQt5.QtWidgets import QMessageBox
 
-from novelwriter.core import NWDoc
 from novelwriter.enum import nwState
+from novelwriter.core.document import NWDoc
 
 
 @pytest.mark.gui