From 154e91ede819579332eb098130151ea59760256a Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 9 Nov 2019 21:01:43 +0100 Subject: [PATCH] Remove unused imports --- nw/config.py | 2 +- nw/convert/file/concat.py | 4 +--- nw/convert/tokenizer.py | 1 - nw/gui/dialogs/configeditor.py | 11 ++++------- nw/gui/dialogs/export.py | 3 +-- nw/gui/dialogs/itemeditor.py | 4 ++-- nw/gui/dialogs/projecteditor.py | 6 +++--- nw/gui/dialogs/sessionlog.py | 7 +++---- nw/gui/dialogs/timelineview.py | 8 ++++---- nw/gui/elements/doceditor.py | 6 +++--- nw/gui/elements/doctree.py | 2 +- nw/gui/elements/docviewer.py | 2 +- nw/gui/elements/noticebar.py | 2 -- nw/gui/elements/searchbar.py | 1 - nw/gui/elements/viewdetails.py | 4 +--- nw/gui/mainmenu.py | 2 +- nw/gui/statusbar.py | 4 ++-- nw/gui/theme.py | 2 +- nw/gui/tools/dochighlight.py | 2 -- nw/guimain.py | 4 ++-- nw/project/backup.py | 2 +- nw/project/index.py | 3 +-- nw/project/item.py | 1 - nw/project/status.py | 1 - nw/tools/translate.py | 2 -- 25 files changed, 33 insertions(+), 53 deletions(-) diff --git a/nw/config.py b/nw/config.py index 145724e4..d3689ad7 100644 --- a/nw/config.py +++ b/nw/config.py @@ -15,7 +15,7 @@ import configparser import sys import nw -from os import path, mkdir, makedirs, getcwd +from os import path, mkdir, makedirs from appdirs import user_config_dir from datetime import datetime diff --git a/nw/convert/file/concat.py b/nw/convert/file/concat.py index f16b1f47..2d5c1750 100644 --- a/nw/convert/file/concat.py +++ b/nw/convert/file/concat.py @@ -15,11 +15,9 @@ import nw from os import path -from PyQt5.QtWidgets import QMessageBox - from nw.convert.file.text import TextFile from nw.convert.tokenizer import Tokenizer -from nw.constants import nwAlert, nwItemLayout +from nw.constants import nwAlert logger = logging.getLogger(__name__) diff --git a/nw/convert/tokenizer.py b/nw/convert/tokenizer.py index e5cae82b..4b09a04a 100644 --- a/nw/convert/tokenizer.py +++ b/nw/convert/tokenizer.py @@ -10,7 +10,6 @@ """ -import textwrap import logging import re import nw diff --git a/nw/gui/dialogs/configeditor.py b/nw/gui/dialogs/configeditor.py index 18532761..8d3d4b0f 100644 --- a/nw/gui/dialogs/configeditor.py +++ b/nw/gui/dialogs/configeditor.py @@ -16,14 +16,11 @@ import nw from os import path from PyQt5.QtCore import Qt -from PyQt5.QtGui import ( - QIcon, QPixmap, QColor, QBrush, QStandardItemModel, QFont -) +from PyQt5.QtGui import QFont from PyQt5.QtWidgets import ( - QDialog, QHBoxLayout, QVBoxLayout, QFormLayout, QLineEdit, QPlainTextEdit, - QLabel, QWidget, QTabWidget, QDialogButtonBox, QSpinBox, QGroupBox, - QComboBox, QMessageBox, QCheckBox, QGridLayout, QFontComboBox, QPushButton, - QFileDialog + QDialog, QHBoxLayout, QVBoxLayout, QLineEdit, QLabel, QWidget, QTabWidget, + QDialogButtonBox, QSpinBox, QGroupBox, QComboBox, QMessageBox, QCheckBox, + QGridLayout, QFontComboBox, QPushButton, QFileDialog ) from nw.tools import NWSpellCheck, NWSpellSimple, NWSpellEnchant diff --git a/nw/gui/dialogs/export.py b/nw/gui/dialogs/export.py index b3944f74..15a8ed7a 100644 --- a/nw/gui/dialogs/export.py +++ b/nw/gui/dialogs/export.py @@ -24,8 +24,7 @@ from PyQt5.QtWidgets import ( ) from nw.convert import TextFile, HtmlFile, MarkdownFile, LaTeXFile, ConcatFile -from nw.project import NWDoc -from nw.tools import numberToWord, OptLastState +from nw.tools import OptLastState from nw.common import packageRefURL from nw.constants import nwFiles, nwItemType, nwAlert diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/dialogs/itemeditor.py index af6fa609..0dc219ff 100644 --- a/nw/gui/dialogs/itemeditor.py +++ b/nw/gui/dialogs/itemeditor.py @@ -17,8 +17,8 @@ from os import path from PyQt5.QtCore import Qt from PyQt5.QtWidgets import ( - QDialog, QHBoxLayout, QVBoxLayout, QGroupBox, QFormLayout, - QLineEdit, QPushButton, QComboBox + QDialog, QHBoxLayout, QVBoxLayout, QGroupBox, QFormLayout, QLineEdit, + QPushButton, QComboBox ) from nw.constants import nwLabels, nwItemLayout, nwItemClass, nwItemType diff --git a/nw/gui/dialogs/projecteditor.py b/nw/gui/dialogs/projecteditor.py index 0c6d8fae..6a09fe7d 100644 --- a/nw/gui/dialogs/projecteditor.py +++ b/nw/gui/dialogs/projecteditor.py @@ -19,9 +19,9 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QIcon, QPixmap, QColor, QBrush from PyQt5.QtWidgets import ( QDialog, QHBoxLayout, QVBoxLayout, QFormLayout, QLineEdit, QPlainTextEdit, - QLabel, QWidget, QTabWidget, QDialogButtonBox, QListWidget, - QListWidgetItem, QPushButton, QColorDialog, QAbstractItemView, QTreeWidget, - QTreeWidgetItem, QCheckBox + QLabel, QWidget, QTabWidget, QDialogButtonBox, QListWidget, QPushButton, + QListWidgetItem, QColorDialog, QAbstractItemView, QTreeWidget, QCheckBox, + QTreeWidgetItem ) from nw.constants import nwAlert diff --git a/nw/gui/dialogs/sessionlog.py b/nw/gui/dialogs/sessionlog.py index fcbc54e9..ccea5b1d 100644 --- a/nw/gui/dialogs/sessionlog.py +++ b/nw/gui/dialogs/sessionlog.py @@ -17,11 +17,10 @@ from os import path from datetime import datetime from PyQt5.QtCore import Qt -from PyQt5.QtGui import QIcon, QColor, QPixmap, QFont +from PyQt5.QtGui import QFont from PyQt5.QtWidgets import ( - QDialog, QVBoxLayout, QHBoxLayout, QTreeWidget, QTreeWidgetItem, - QDialogButtonBox, QHeaderView, QGridLayout, QLabel, QGroupBox, - QCheckBox + QDialog, QHBoxLayout, QTreeWidget, QTreeWidgetItem, QDialogButtonBox, + QGridLayout, QLabel, QGroupBox, QCheckBox ) from nw.constants import nwConst, nwFiles, nwAlert diff --git a/nw/gui/dialogs/timelineview.py b/nw/gui/dialogs/timelineview.py index 0ac3148f..dab545fc 100644 --- a/nw/gui/dialogs/timelineview.py +++ b/nw/gui/dialogs/timelineview.py @@ -16,11 +16,11 @@ import nw from os import path from PyQt5.QtCore import Qt -from PyQt5.QtGui import QIcon, QColor, QPixmap +from PyQt5.QtGui import QColor, QPixmap from PyQt5.QtWidgets import ( - QDialog, QVBoxLayout, QHBoxLayout, QTableWidget, QTableWidgetItem, - QDialogButtonBox, QLabel, QPushButton, QHeaderView, QGridLayout, - QGroupBox, QCheckBox + QDialog, QVBoxLayout, QHBoxLayout, QTableWidget, QTableWidgetItem, QLabel, + QDialogButtonBox, QPushButton, QHeaderView, QGridLayout, QGroupBox, + QCheckBox ) from nw.constants import nwFiles, nwItemClass diff --git a/nw/gui/elements/doceditor.py b/nw/gui/elements/doceditor.py index f5f22e2a..a3c0a440 100644 --- a/nw/gui/elements/doceditor.py +++ b/nw/gui/elements/doceditor.py @@ -15,13 +15,13 @@ import nw from time import time -from PyQt5.QtCore import Qt, QTimer, QSizeF +from PyQt5.QtCore import Qt, QTimer from PyQt5.QtWidgets import ( qApp, QTextEdit, QAction, QMenu, QShortcut, QMessageBox ) from PyQt5.QtGui import ( - QTextCursor, QTextOption, QIcon, QKeySequence, QFont, QColor, - QPalette, QTextDocument + QTextCursor, QTextOption, QKeySequence, QFont, QColor, QPalette, + QTextDocument ) from nw.project import NWDoc diff --git a/nw/gui/elements/doctree.py b/nw/gui/elements/doctree.py index 6eb1441e..d5b9fb4f 100644 --- a/nw/gui/elements/doctree.py +++ b/nw/gui/elements/doctree.py @@ -14,7 +14,7 @@ import logging import nw from PyQt5.QtCore import Qt, QSize -from PyQt5.QtGui import QIcon, QFont, QColor +from PyQt5.QtGui import QFont, QColor from PyQt5.QtWidgets import ( QTreeWidget, QTreeWidgetItem, QAbstractItemView, QApplication ) diff --git a/nw/gui/elements/docviewer.py b/nw/gui/elements/docviewer.py index 614adafe..ab9585f6 100644 --- a/nw/gui/elements/docviewer.py +++ b/nw/gui/elements/docviewer.py @@ -17,7 +17,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QTextBrowser from PyQt5.QtGui import QTextOption, QFont, QPalette, QColor -from nw.convert import Tokenizer, ToHtml +from nw.convert import ToHtml from nw.constants import nwAlert, nwItemType logger = logging.getLogger(__name__) diff --git a/nw/gui/elements/noticebar.py b/nw/gui/elements/noticebar.py index 37b7f963..98b82239 100644 --- a/nw/gui/elements/noticebar.py +++ b/nw/gui/elements/noticebar.py @@ -13,8 +13,6 @@ import logging import nw -from PyQt5.QtCore import Qt -from PyQt5.QtGui import QPalette, QColor from PyQt5.QtWidgets import QFrame, QHBoxLayout, QLabel, QPushButton logger = logging.getLogger(__name__) diff --git a/nw/gui/elements/searchbar.py b/nw/gui/elements/searchbar.py index 02f97755..cb40878e 100644 --- a/nw/gui/elements/searchbar.py +++ b/nw/gui/elements/searchbar.py @@ -14,7 +14,6 @@ import logging import nw from PyQt5.QtCore import Qt -from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import ( QFrame, QGridLayout, QLabel, QLineEdit, QPushButton, QApplication ) diff --git a/nw/gui/elements/viewdetails.py b/nw/gui/elements/viewdetails.py index 05c4be25..2a0c9a29 100644 --- a/nw/gui/elements/viewdetails.py +++ b/nw/gui/elements/viewdetails.py @@ -14,10 +14,8 @@ import logging import nw from PyQt5.QtCore import Qt, QSize -from PyQt5.QtGui import QFont from PyQt5.QtWidgets import ( - QWidget, QHBoxLayout, QVBoxLayout, QLabel, QGroupBox, QScrollArea, QFrame, - QToolButton, QSizePolicy, QCheckBox, QGridLayout + QWidget, QLabel, QScrollArea, QFrame, QToolButton, QCheckBox, QGridLayout ) from nw.constants import nwLabels diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py index 0212a136..4f252a88 100644 --- a/nw/gui/mainmenu.py +++ b/nw/gui/mainmenu.py @@ -14,7 +14,7 @@ import logging import nw from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QIcon, QDesktopServices +from PyQt5.QtGui import QDesktopServices from PyQt5.QtWidgets import QMenuBar, QAction, QMessageBox from nw.constants import nwItemType, nwItemClass, nwDocAction diff --git a/nw/gui/statusbar.py b/nw/gui/statusbar.py index 002fe39b..08b30870 100644 --- a/nw/gui/statusbar.py +++ b/nw/gui/statusbar.py @@ -16,8 +16,8 @@ import nw from time import time from PyQt5.QtCore import Qt, QTimer -from PyQt5.QtGui import QIcon, QColor, QPixmap, QFont -from PyQt5.QtWidgets import QStatusBar, QLabel, QFrame +from PyQt5.QtGui import QColor, QPixmap, QFont +from PyQt5.QtWidgets import QStatusBar, QLabel from nw.tools import NWSpellCheck diff --git a/nw/gui/theme.py b/nw/gui/theme.py index ecfb6d04..8eb74502 100644 --- a/nw/gui/theme.py +++ b/nw/gui/theme.py @@ -17,7 +17,7 @@ import nw from os import path, listdir from PyQt5.QtWidgets import qApp -from PyQt5.QtGui import QPalette, QColor, QIcon, QPixmap +from PyQt5.QtGui import QPalette, QColor, QIcon from nw.constants import nwAlert from nw.gui.icons import GuiIcons diff --git a/nw/gui/tools/dochighlight.py b/nw/gui/tools/dochighlight.py index 02090d94..e8ac2b04 100644 --- a/nw/gui/tools/dochighlight.py +++ b/nw/gui/tools/dochighlight.py @@ -18,8 +18,6 @@ from PyQt5.QtGui import ( QColor, QTextCharFormat, QFont, QSyntaxHighlighter, QBrush ) -from nw.constants import nwUnicode - logger = logging.getLogger(__name__) class GuiDocHighlighter(QSyntaxHighlighter): diff --git a/nw/guimain.py b/nw/guimain.py index ba275963..5d6557c5 100644 --- a/nw/guimain.py +++ b/nw/guimain.py @@ -19,8 +19,8 @@ from os import path from PyQt5.QtCore import Qt, QTimer from PyQt5.QtGui import QIcon, QPixmap, QColor from PyQt5.QtWidgets import ( - qApp, QWidget, QMainWindow, QVBoxLayout, QFrame, QSplitter, QFileDialog, - QShortcut, QMessageBox, QProgressDialog, QDialog + qApp, QMainWindow, QVBoxLayout, QFrame, QSplitter, QFileDialog, QShortcut, + QMessageBox, QProgressDialog, QDialog ) from nw.gui import ( diff --git a/nw/project/backup.py b/nw/project/backup.py index 9e6e5a38..bab5ffcc 100644 --- a/nw/project/backup.py +++ b/nw/project/backup.py @@ -13,7 +13,7 @@ import logging import nw -from os import path, mkdir, listdir +from os import path from shutil import make_archive from datetime import datetime diff --git a/nw/project/index.py b/nw/project/index.py index c8c4c4cb..dc5edb75 100644 --- a/nw/project/index.py +++ b/nw/project/index.py @@ -16,9 +16,8 @@ import nw from os import path -from nw.project.document import NWDoc from nw.constants import ( - nwFiles, nwKeyWords, nwItemType, nwItemClass, nwItemLayout, nwAlert + nwFiles, nwKeyWords, nwItemType, nwItemClass, nwAlert ) logger = logging.getLogger(__name__) diff --git a/nw/project/item.py b/nw/project/item.py index 7c30fc8b..5eb98f4b 100644 --- a/nw/project/item.py +++ b/nw/project/item.py @@ -13,7 +13,6 @@ import logging import nw -from os import path, mkdir from lxml import etree from datetime import datetime diff --git a/nw/project/status.py b/nw/project/status.py index df6f5815..3edd417a 100644 --- a/nw/project/status.py +++ b/nw/project/status.py @@ -16,7 +16,6 @@ import nw from lxml import etree from nw.common import checkInt -from nw.constants import nwItemClass logger = logging.getLogger(__name__) diff --git a/nw/tools/translate.py b/nw/tools/translate.py index c32db147..62e6d4d3 100644 --- a/nw/tools/translate.py +++ b/nw/tools/translate.py @@ -13,8 +13,6 @@ import logging import nw -from os import path - logger = logging.getLogger(__name__) def numberToWord(numVal, theLanguage):