Imports cleanup

codecov.yml

@@ -4,7 +4,7 @@ codecov:
 coverage:
   precision: 2
   round: nearest
-  range: "70...90"
+  range: "70...95"
 
   status:
     project:

nw/constants/iso.py

@@ -25,10 +25,6 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
-
-logger = logging.getLogger(__name__)
-
 class isoLanguage():
 
     ISO_639_1 = {

nw/core/index.py

@@ -25,9 +25,9 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
+import nw
 import logging
 import json
-import nw
 
 from os import path
 from time import time

nw/core/project.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path, mkdir, listdir, unlink, rename, rmdir
 from lxml import etree
@@ -41,7 +41,8 @@ from nw.core.document import NWDoc
 from nw.core.status import NWStatus
 from nw.core.options import OptionState
 from nw.common import (
-    checkString, checkBool, checkInt, isHandle, formatTimeStamp, makeFileNameSafe
+    checkString, checkBool, checkInt, isHandle, formatTimeStamp,
+    makeFileNameSafe
 )
 from nw.constants import (
     nwFiles, nwItemType, nwItemClass, nwItemLayout, nwLabels, nwAlert

nw/core/spellcheck.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path, listdir
 from difflib import get_close_matches

nw/gui/about.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path
 from datetime import datetime

nw/gui/buildnovel.py

@@ -25,9 +25,9 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
+import nw
 import logging
 import json
-import nw
 
 from os import path
 from time import time

nw/gui/custom.py

@@ -27,8 +27,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtGui import QColor, QPalette, QPainter, QFontMetrics
 from PyQt5.QtCore import (

nw/gui/doceditor.py

@@ -30,8 +30,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from time import time
 

nw/gui/dochighlight.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt, QRegularExpression
 from PyQt5.QtGui import (

nw/gui/docmerge.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (

nw/gui/docsplit.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
@@ -34,9 +34,11 @@ from PyQt5.QtWidgets import (
     QListWidgetItem, QDialogButtonBox, QLabel, QMessageBox
 )
 
-from nw.constants import nwAlert, nwItemType, nwItemClass, nwItemLayout, nwConst
-from nw.gui.custom import QHelpLabel
 from nw.core import NWDoc
+from nw.gui.custom import QHelpLabel
+from nw.constants import (
+    nwAlert, nwItemType, nwItemClass, nwItemLayout, nwConst
+)
 
 logger = logging.getLogger(__name__)
 

nw/gui/docviewer.py

@@ -29,8 +29,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt, QUrl, QSize, pyqtSlot
 from PyQt5.QtGui import (

nw/gui/itemdetails.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QFont, QPixmap

nw/gui/itemeditor.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtWidgets import (
     QDialog, QVBoxLayout, QGridLayout, QLineEdit, QComboBox, QLabel,

nw/gui/mainmenu.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import QUrl, QProcess
 from PyQt5.QtGui import QDesktopServices

nw/gui/outline.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from time import time
 

nw/gui/outlinedetails.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (

nw/gui/preferences.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path
 

nw/gui/projload.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path
 from datetime import datetime

nw/gui/projsettings.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QIcon, QPixmap, QColor, QBrush

nw/gui/projtree.py

@@ -26,8 +26,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from PyQt5.QtCore import Qt, QSize
 from PyQt5.QtGui import QIcon

nw/gui/projwizard.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path
 

nw/gui/statusbar.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from time import time
 

nw/gui/theme.py

@@ -26,9 +26,9 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
+import nw
 import logging
 import configparser
-import nw
 
 from os import path, listdir
 from math import ceil

nw/gui/writingstats.py

@@ -25,9 +25,9 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
+import nw
 import logging
 import json
-import nw
 
 from os import path
 from datetime import datetime

nw/guimain.py

@@ -25,8 +25,8 @@
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import logging
 import nw
+import logging
 
 from os import path
 from datetime import datetime
@@ -40,11 +40,11 @@ from PyQt5.QtWidgets import (
 )
 
 from nw.gui import (
-    GuiBuildNovel, GuiDocEditor, GuiDocMerge, GuiDocSplit, GuiDocViewDetails,
+    GuiAbout, GuiBuildNovel, GuiDocEditor, GuiDocMerge, GuiDocSplit,
-    GuiDocViewer, GuiItemDetails, GuiItemEditor, GuiMainMenu, GuiMainStatus,
+    GuiDocViewDetails, GuiDocViewer, GuiItemDetails, GuiItemEditor,
-    GuiOutline, GuiOutlineDetails, GuiPreferences, GuiProjectLoad, GuiTheme,
+    GuiMainMenu, GuiMainStatus, GuiOutline, GuiOutlineDetails, GuiPreferences,
-    GuiProjectSettings, GuiProjectTree, GuiWritingStats, GuiProjectWizard,
+    GuiProjectLoad, GuiProjectSettings, GuiProjectTree, GuiProjectWizard,
-    GuiAbout
+    GuiTheme, GuiWritingStats
 )
 from nw.core import NWProject, NWDoc, NWIndex
 from nw.constants import nwItemType, nwItemClass, nwAlert