Run isort on all Python files

ReText/__init__.py

@@ -16,10 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from os.path import abspath, dirname, expanduser, join
+
 import markups
 import markups.common
-from os.path import abspath, dirname, join, expanduser
-
 from PyQt6.QtCore import QByteArray, QLocale, QSettings
 from PyQt6.QtGui import QFont, QFontDatabase
 

ReText/__main__.py

@@ -19,18 +19,29 @@
 
 import ctypes
 import multiprocessing
-import sys
 import signal
-import markups
+import sys
 from os.path import exists, isdir, join
-from ReText import packageDir, settings, cache, globalSettings, app_version
-from ReText.window import ReTextWindow
 
-from PyQt6.QtCore import QCommandLineOption, QCommandLineParser, QFile, \
- QFileInfo, QIODevice, QLibraryInfo, QTextStream, QTranslator, Qt
-from PyQt6.QtWidgets import QApplication
-from PyQt6.QtNetwork import QNetworkProxyFactory
+import markups
+from PyQt6.QtCore import (
+    QCommandLineOption,
+    QCommandLineParser,
+    QFile,
+    QFileInfo,
+    QIODevice,
+    QLibraryInfo,
+    Qt,
+    QTextStream,
+    QTranslator,
+)
 from PyQt6.QtDBus import QDBusConnection, QDBusInterface
+from PyQt6.QtNetwork import QNetworkProxyFactory
+from PyQt6.QtWidgets import QApplication
+
+from ReText import app_version, cache, globalSettings, packageDir, settings
+from ReText.window import ReTextWindow
+
 
 def canonicalize(option):
     if option == '-':

ReText/config.py

@@ -15,16 +15,29 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-from ReText import globalSettings, getBundledIcon, getSettingsFilePath
-from ReText.icontheme import get_icon_theme
-from markups.common import CONFIGURATION_DIR
 from os.path import join
 
-from PyQt6.QtCore import pyqtSignal, QFile, QFileInfo, QUrl, Qt
+from markups.common import CONFIGURATION_DIR
+from PyQt6.QtCore import QFile, QFileInfo, Qt, QUrl, pyqtSignal
 from PyQt6.QtGui import QDesktopServices, QIcon
-from PyQt6.QtWidgets import QCheckBox, QDialog, QDialogButtonBox, \
- QFileDialog, QGridLayout, QLabel, QLineEdit, QPushButton, QSpinBox, \
- QComboBox, QTabWidget, QVBoxLayout, QWidget
+from PyQt6.QtWidgets import (
+    QCheckBox,
+    QComboBox,
+    QDialog,
+    QDialogButtonBox,
+    QFileDialog,
+    QGridLayout,
+    QLabel,
+    QLineEdit,
+    QPushButton,
+    QSpinBox,
+    QTabWidget,
+    QVBoxLayout,
+    QWidget,
+)
+
+from ReText import getBundledIcon, getSettingsFilePath, globalSettings
+from ReText.icontheme import get_icon_theme
 
 MKD_EXTS_FILE = join(CONFIGURATION_DIR, 'markdown-extensions.txt')
 

ReText/converterprocess.py

@@ -14,17 +14,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import markups
 import multiprocessing as mp
 import os
 import pickle
 import signal
-from socket import socketpair
 import struct
 import traceback
 import weakref
+from socket import socketpair
+
+import markups
+from PyQt6.QtCore import QObject, QSocketNotifier, pyqtSignal
 
-from PyQt6.QtCore import pyqtSignal, QObject, QSocketNotifier
 
 def recvall(sock, remaining):
     alldata = bytearray()

ReText/dialogs.py

@@ -14,11 +14,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from PyQt6.QtWidgets import (
+    QCheckBox,
+    QDialog,
+    QDialogButtonBox,
+    QLabel,
+    QLineEdit,
+    QTextEdit,
+    QVBoxLayout,
+)
+
 from ReText import globalSettings
 from ReText.highlighter import ReTextHighlighter
 
-from PyQt6.QtWidgets import QCheckBox, QDialog, QDialogButtonBox, \
- QLabel, QLineEdit, QTextEdit, QVBoxLayout
 
 class HtmlDialog(QDialog):
     def __init__(self, parent=None):

ReText/editor.py

@@ -21,13 +21,33 @@
 import weakref
 
 from markups import MarkdownMarkup, ReStructuredTextMarkup, TextileMarkup
-from ReText import globalSettings, settings, tablemode
-
-from PyQt6.QtCore import pyqtSignal, QFileInfo, QMimeDatabase, QPoint, QPointF, QRect, QSize, Qt
-from PyQt6.QtGui import QAction, QColor, QImage, QKeyEvent, QMouseEvent, QPainter, \
-QPalette, QTextCursor, QTextFormat, QWheelEvent, QGuiApplication
+from PyQt6.QtCore import (
+    QFileInfo,
+    QMimeDatabase,
+    QPoint,
+    QPointF,
+    QRect,
+    QSize,
+    Qt,
+    pyqtSignal,
+)
+from PyQt6.QtGui import (
+    QAction,
+    QColor,
+    QGuiApplication,
+    QImage,
+    QKeyEvent,
+    QMouseEvent,
+    QPainter,
+    QPalette,
+    QTextCursor,
+    QTextFormat,
+    QWheelEvent,
+)
 from PyQt6.QtWidgets import QApplication, QFileDialog, QLabel, QTextEdit, QWidget
 
+from ReText import globalSettings, settings, tablemode
+
 try:
     from ReText.fakevimeditor import ReTextFakeVimHandler
 except ImportError:

ReText/fakevimeditor.py

@@ -14,16 +14,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from FakeVim import FakeVimProxy, FakeVimHandler, FAKEVIM_PYQT_VERSION, \
-    MessageError
+from FakeVim import FAKEVIM_PYQT_VERSION, FakeVimHandler, FakeVimProxy, MessageError
 
 if FAKEVIM_PYQT_VERSION != 6:
     raise ImportError("FakeVim must be compiled with Qt 6")
 
-from PyQt6.QtCore import QDir, QRegExp, QObject, Qt
+from PyQt6.QtCore import QDir, QObject, QRegExp, Qt
 from PyQt6.QtGui import QPainter, QPen, QTextCursor
-from PyQt6.QtWidgets import QWidget, QLabel, QLineEdit, \
-    QMessageBox, QStatusBar, QTextEdit
+from PyQt6.QtWidgets import (
+    QLabel,
+    QLineEdit,
+    QMessageBox,
+    QStatusBar,
+    QTextEdit,
+    QWidget,
+)
+
 
 class FakeVimMode:
     @staticmethod

ReText/highlighter.py

@@ -14,13 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ReText.editor import getColor
-from enum import IntFlag, auto
 import re
+from enum import IntFlag, auto
 
 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QFont, QSyntaxHighlighter, QTextCharFormat
 
+from ReText.editor import getColor
+
 reHtmlTags     = re.compile('<[^<>@]*>')
 reHtmlSymbols  = re.compile(r'&#?\w+;')
 reHtmlStrings  = re.compile('"[^"<]*"(?=[^<]*>)')

ReText/icontheme.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 def get_from_xsettings():
-    from ReText.xsettings import get_xsettings, XSettingsError
+    from ReText.xsettings import XSettingsError, get_xsettings
     try:
         xsettings = get_xsettings()
     except XSettingsError:

ReText/preview.py

@@ -16,11 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from os.path import exists
 import time
+from os.path import exists
+
 from PyQt6.QtCore import QDir, QUrl
 from PyQt6.QtGui import QDesktopServices, QTextCursor, QTextDocument
 from PyQt6.QtWidgets import QTextBrowser
+
 from ReText import globalSettings
 
 class ReTextPreview(QTextBrowser):

ReText/tab.py

@@ -16,21 +16,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from os.path import exists, splitext
 import locale
 import time
-from markups import get_markup_for_file_name, find_markup_class_by_name
+from os.path import exists, splitext
+
+from markups import find_markup_class_by_name, get_markup_for_file_name
 from markups.common import MODULE_HOME_PAGE
+from PyQt6.QtCore import QDir, QFile, QFileInfo, QPoint, Qt, QTimer, QUrl, pyqtSignal
+from PyQt6.QtGui import QPalette, QTextCursor, QTextDocument
+from PyQt6.QtWidgets import QApplication, QMessageBox, QSplitter, QTextEdit
 
-from ReText import app_version, globalSettings, converterprocess
+from ReText import app_version, converterprocess, globalSettings
 from ReText.editor import ReTextEdit
 from ReText.highlighter import ReTextHighlighter
 from ReText.preview import ReTextPreview
 
-from PyQt6.QtCore import pyqtSignal, Qt, QDir, QFile, QFileInfo, QPoint, QTimer, QUrl
-from PyQt6.QtGui import QPalette, QTextCursor, QTextDocument
-from PyQt6.QtWidgets import QApplication, QTextEdit, QSplitter, QMessageBox
-
 try:
     from ReText.webenginepreview import ReTextWebEnginePreview
 except ImportError:

ReText/tabledialog.py

@@ -16,8 +16,7 @@
 
 from markups import ReStructuredTextMarkup
 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QGridLayout, QLabel, \
-    QSpinBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QGridLayout, QLabel, QSpinBox
 
 
 class InsertTableDialog(QDialog):

ReText/tablemode.py

@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-from markups import MarkdownMarkup, ReStructuredTextMarkup
 
+from markups import MarkdownMarkup, ReStructuredTextMarkup
 from PyQt6.QtGui import QTextCursor
 
 LARGER_THAN_ANYTHING = sys.maxsize

ReText/webenginepreview.py

@@ -16,19 +16,27 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ReText import globalSettings
-from ReText.editor import getColor
-from ReText.syncscroll import SyncScroll
 from PyQt6.QtCore import QEvent, Qt
-from PyQt6.QtGui import QCursor, QDesktopServices, QFontInfo, QGuiApplication, QTextDocument, QColor
-from PyQt6.QtWidgets import QLabel
+from PyQt6.QtGui import (
+    QColor,
+    QCursor,
+    QDesktopServices,
+    QFontInfo,
+    QGuiApplication,
+    QTextDocument,
+)
 from PyQt6.QtWebEngineCore import (
     QWebEnginePage,
     QWebEngineSettings,
     QWebEngineUrlRequestInfo,
     QWebEngineUrlRequestInterceptor,
 )
 from PyQt6.QtWebEngineWidgets import QWebEngineView
+from PyQt6.QtWidgets import QLabel
+
+from ReText import globalSettings
+from ReText.editor import getColor
+from ReText.syncscroll import SyncScroll
 
 
 class ReTextWebEngineUrlRequestInterceptor(QWebEngineUrlRequestInterceptor):