Use direct imports everywhere

novelwriter/core/__init__.py

@@ -1,40 +0,0 @@
-"""
-novelWriter – Core Init
-=======================
-
-This file is a part of novelWriter
-Copyright 2018–2022, Veronica Berglyd Olsen
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
-
-from novelwriter.core.coretools import DocMerger, DocSplitter, ProjectBuilder
-from novelwriter.core.index import countWords
-from novelwriter.core.project import NWProject
-from novelwriter.core.spellcheck import NWSpellEnchant
-from novelwriter.core.tohtml import ToHtml
-from novelwriter.core.toodt import ToOdt
-from novelwriter.core.tomd import ToMarkdown
-
-__all__ = [
-    "DocMerger",
-    "DocSplitter",
-    "ProjectBuilder",
-    "countWords",
-    "NWProject",
-    "NWSpellEnchant",
-    "ToHtml",
-    "ToOdt",
-    "ToMarkdown",
-]

novelwriter/core/index.py

@@ -36,10 +36,8 @@ from pathlib import Path
 
 from novelwriter.enum import nwItemType, nwItemLayout
 from novelwriter.error import logException
+from novelwriter.common import checkInt, isHandle, isItemClass, isTitleTag, jsonEncode
 from novelwriter.constants import nwFiles, nwKeyWords, nwUnicode, nwHeaders
-from novelwriter.common import (
-    checkInt, isHandle, isItemClass, isTitleTag, jsonEncode
-)
 
 logger = logging.getLogger(__name__)
 

novelwriter/core/storage.py

@@ -30,11 +30,11 @@ from time import time
 from pathlib import Path
 from zipfile import ZIP_DEFLATED, ZIP_STORED, ZipFile
 
+from novelwriter.error import logException
 from novelwriter.common import minmax
 from novelwriter.constants import nwFiles
 from novelwriter.core.document import NWDocument
 from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter
-from novelwriter.error import logException
 
 logger = logging.getLogger(__name__)
 

novelwriter/core/tohtml.py

@@ -25,8 +25,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import logging
 
-from novelwriter.core.tokenizer import Tokenizer
 from novelwriter.constants import nwKeyWords, nwLabels, nwHtmlUnicode
+from novelwriter.core.tokenizer import Tokenizer
 
 logger = logging.getLogger(__name__)