Make all imports in tests explicit

tests/test_core/test_core_doctools.py

@@ -27,7 +27,9 @@ from shutil import copyfile
 from mock import causeOSError
 from tools import C, buildTestProject, cmpFiles
 
-from novelwriter.core import NWProject, DocMerger, DocSplitter, NWDoc
+from novelwriter.core.project import NWProject
+from novelwriter.core.doctools import DocMerger, DocSplitter
+from novelwriter.core.document import NWDoc
 
 
 @pytest.mark.core

tests/test_core/test_core_document.py

@@ -25,8 +25,9 @@ import pytest
 from mock import causeOSError
 from tools import readFile, writeFile
 
-from novelwriter.core import NWProject, NWDoc
 from novelwriter.enum import nwItemClass, nwItemLayout
+from novelwriter.core.project import NWProject
+from novelwriter.core.document import NWDoc
 
 
 @pytest.mark.core

tests/test_core/test_core_index.py

@@ -28,9 +28,9 @@ from shutil import copyfile
 from mock import causeException
 from tools import buildTestProject, cmpFiles, writeFile
 
-from novelwriter.core.project import NWProject
-from novelwriter.core.index import NWIndex, countWords, TagsIndex
 from novelwriter.enum import nwItemClass, nwItemLayout
+from novelwriter.core.index import NWIndex, countWords, TagsIndex
+from novelwriter.core.project import NWProject
 
 
 @pytest.mark.core

tests/test_core/test_core_item.py

@@ -25,8 +25,8 @@ from lxml import etree
 
 from PyQt5.QtGui import QIcon
 
-from novelwriter.core import NWProject
 from novelwriter.core.item import NWItem
+from novelwriter.core.project import NWProject
 from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout
 
 

tests/test_core/test_core_options.py

@@ -26,8 +26,8 @@ import pytest
 from mock import causeOSError
 from tools import writeFile
 
-from novelwriter.core import NWProject
 from novelwriter.core.options import OptionState
+from novelwriter.core.project import NWProject
 from novelwriter.constants import nwFiles
 
 

tests/test_core/test_core_tohtml.py

@@ -24,7 +24,8 @@ import pytest
 
 from tools import readFile
 
-from novelwriter.core import NWProject, ToHtml
+from novelwriter.core.tohtml import ToHtml
+from novelwriter.core.project import NWProject
 
 
 @pytest.mark.core

tests/test_core/test_core_tokenizer.py

@@ -24,7 +24,8 @@ import pytest
 
 from tools import readFile
 
-from novelwriter.core import NWProject, NWDoc
+from novelwriter.core.project import NWProject
+from novelwriter.core.document import NWDoc
 from novelwriter.core.tokenizer import Tokenizer
 
 

tests/test_core/test_core_tomd.py

@@ -24,7 +24,8 @@ import pytest
 
 from tools import readFile
 
-from novelwriter.core import NWProject, ToMarkdown
+from novelwriter.core.tomd import ToMarkdown
+from novelwriter.core.project import NWProject
 
 
 @pytest.mark.core

tests/test_core/test_core_toodt.py

@@ -28,8 +28,8 @@ from shutil import copyfile
 
 from tools import cmpFiles
 
-from novelwriter.core import NWProject, ToOdt
-from novelwriter.core.toodt import ODTParagraphStyle, ODTTextStyle, XMLParagraph, _mkTag
+from novelwriter.core.toodt import ToOdt, ODTParagraphStyle, ODTTextStyle, XMLParagraph, _mkTag
+from novelwriter.core.project import NWProject
 
 XML_NS = [
     ' xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"',

tests/test_core/test_core_tree.py

@@ -27,9 +27,11 @@ from lxml import etree
 
 from tools import readFile
 
-from novelwriter.core.project import NWProject, NWItem, NWTree
 from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout
 from novelwriter.constants import nwFiles
+from novelwriter.core.item import NWItem
+from novelwriter.core.tree import NWTree
+from novelwriter.core.project import NWProject
 
 
 @pytest.fixture(scope="function")