From 4d8e4c53e3ec4a9fdd0185323d754a6275a95ce5 Mon Sep 17 00:00:00 2001 From: deeplow Date: Wed, 20 Jul 2022 09:07:34 +0100 Subject: [PATCH] sort imports with isort linter --- container/dangerzone.py | 6 +++--- dangerzone/cli.py | 7 ++++--- dangerzone/common.py | 3 ++- dangerzone/container.py | 9 +++++---- dangerzone/global_common.py | 21 ++++++++++++--------- dangerzone/gui/__init__.py | 15 ++++++++------- dangerzone/gui/common.py | 15 ++++++++------- dangerzone/gui/main_window.py | 11 ++++++----- dangerzone/gui/systray.py | 1 + dangerzone/settings.py | 3 +-- dev_scripts/dangerzone | 3 ++- install/linux/build-deb.py | 6 +++--- install/linux/build-rpm.py | 7 +++---- install/macos/build-app.py | 8 ++++---- install/pyinstaller/dangerzone | 2 ++ install/windows/build-image.py | 2 +- setup-windows.py | 3 ++- setup.py | 3 ++- 18 files changed, 69 insertions(+), 56 deletions(-) diff --git a/container/dangerzone.py b/container/dangerzone.py index c42c691..41656fb 100644 --- a/container/dangerzone.py +++ b/container/dangerzone.py @@ -12,12 +12,12 @@ pixels_to_pdf: - 95%-100%: Compress the final PDF """ -import sys -import subprocess import glob -import os import json +import os import shutil +import subprocess +import sys import magic from PIL import Image diff --git a/dangerzone/cli.py b/dangerzone/cli.py index a3e010e..4840740 100644 --- a/dangerzone/cli.py +++ b/dangerzone/cli.py @@ -1,13 +1,14 @@ +import json +import logging import os import sys -import json + import click -import logging from colorama import Fore, Style -from .global_common import GlobalCommon from .common import Common from .container import convert +from .global_common import GlobalCommon def print_header(s): diff --git a/dangerzone/common.py b/dangerzone/common.py index 7d1f4d9..8f376cf 100644 --- a/dangerzone/common.py +++ b/dangerzone/common.py @@ -1,7 +1,8 @@ import os -import stat import platform +import stat import tempfile + import appdirs diff --git a/dangerzone/container.py b/dangerzone/container.py index 42c8150..930de7a 100644 --- a/dangerzone/container.py +++ b/dangerzone/container.py @@ -1,10 +1,11 @@ -import platform -import subprocess -import pipes -import shutil import logging import os +import pipes +import platform +import shutil +import subprocess import tempfile + import appdirs # What container tech is used for this platform? diff --git a/dangerzone/global_common.py b/dangerzone/global_common.py index ae8ab0c..8ec9af0 100644 --- a/dangerzone/global_common.py +++ b/dangerzone/global_common.py @@ -1,17 +1,20 @@ -import sys -import appdirs +import gzip +import inspect +import json +import logging +import os import pathlib import platform -import subprocess import shutil -import json -import gzip -import colorama -from colorama import Fore, Back, Style -import logging +import subprocess +import sys + +import appdirs +import colorama +from colorama import Back, Fore, Style -from .settings import Settings from .container import convert +from .settings import Settings log = logging.getLogger(__name__) diff --git a/dangerzone/gui/__init__.py b/dangerzone/gui/__init__.py index cf77261..c7be4f8 100644 --- a/dangerzone/gui/__init__.py +++ b/dangerzone/gui/__init__.py @@ -1,16 +1,17 @@ -import os -import sys -import signal -import platform -import click -import uuid import logging +import os +import platform +import signal +import sys +import uuid + +import click from PySide2 import QtCore, QtWidgets +from ..global_common import GlobalCommon from .common import GuiCommon from .main_window import MainWindow from .systray import SysTray -from ..global_common import GlobalCommon # For some reason, Dangerzone segfaults if I inherit from QApplication directly, so instead diff --git a/dangerzone/gui/common.py b/dangerzone/gui/common.py index 782726b..97df9a7 100644 --- a/dangerzone/gui/common.py +++ b/dangerzone/gui/common.py @@ -1,11 +1,12 @@ -import os -import platform -import subprocess -import shlex -import pipes -from PySide2 import QtCore, QtGui, QtWidgets -from colorama import Fore import logging +import os +import pipes +import platform +import shlex +import subprocess + +from colorama import Fore +from PySide2 import QtCore, QtGui, QtWidgets if platform.system() == "Darwin": import plistlib diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index 28a3ac7..1b0de69 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -1,12 +1,13 @@ +import json +import logging import os import platform -import tempfile -import subprocess -import json import shutil -import logging +import subprocess +import tempfile + +from colorama import Fore, Style from PySide2 import QtCore, QtGui, QtWidgets -from colorama import Style, Fore from ..common import Common from ..container import convert diff --git a/dangerzone/gui/systray.py b/dangerzone/gui/systray.py index c5ad8c1..3b84159 100644 --- a/dangerzone/gui/systray.py +++ b/dangerzone/gui/systray.py @@ -1,4 +1,5 @@ import platform + from PySide2 import QtWidgets diff --git a/dangerzone/settings.py b/dangerzone/settings.py index 1b1e0f0..9c125f1 100644 --- a/dangerzone/settings.py +++ b/dangerzone/settings.py @@ -1,7 +1,6 @@ -import os import json -import appdirs import logging +import os log = logging.getLogger(__name__) diff --git a/dev_scripts/dangerzone b/dev_scripts/dangerzone index f1f3613..ab3fe70 100755 --- a/dev_scripts/dangerzone +++ b/dev_scripts/dangerzone @@ -2,7 +2,8 @@ # -*- coding: utf-8 -*- # Load dangerzone module and resources from the source code tree -import os, sys +import os +import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.dangerzone_dev = True diff --git a/install/linux/build-deb.py b/install/linux/build-deb.py index 6dba332..1901122 100755 --- a/install/linux/build-deb.py +++ b/install/linux/build-deb.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import os -import sys import inspect -import subprocess +import os import shutil +import subprocess +import sys root = os.path.dirname( os.path.dirname( diff --git a/install/linux/build-rpm.py b/install/linux/build-rpm.py index 8f08c2e..5d7cba4 100755 --- a/install/linux/build-rpm.py +++ b/install/linux/build-rpm.py @@ -1,11 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import os -import sys import inspect -import subprocess +import os import shutil - +import subprocess +import sys root = os.path.dirname( os.path.dirname( diff --git a/install/macos/build-app.py b/install/macos/build-app.py index 47efff7..e13511d 100755 --- a/install/macos/build-app.py +++ b/install/macos/build-app.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import os -import inspect -import subprocess -import shutil import argparse import glob +import inspect import itertools +import os +import shutil +import subprocess root = os.path.dirname( os.path.dirname( diff --git a/install/pyinstaller/dangerzone b/install/pyinstaller/dangerzone index 4d8eeb4..a5efc32 100755 --- a/install/pyinstaller/dangerzone +++ b/install/pyinstaller/dangerzone @@ -5,7 +5,9 @@ # to open in macOS when double-clicking, not just when running from the terminal or opening # with a file. import os + os.environ["LANG"] = "en_US.UTF-8" import dangerzone + dangerzone.main() diff --git a/install/windows/build-image.py b/install/windows/build-image.py index f7abde6..14e1983 100644 --- a/install/windows/build-image.py +++ b/install/windows/build-image.py @@ -1,6 +1,6 @@ -import subprocess import gzip import os +import subprocess def main(): diff --git a/setup-windows.py b/setup-windows.py index 398a6af..98912b8 100644 --- a/setup-windows.py +++ b/setup-windows.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import os -from cx_Freeze import setup, Executable + +from cx_Freeze import Executable, setup with open("share/version.txt") as f: version = f.read().strip() diff --git a/setup.py b/setup.py index 083f0e9..2b4c03b 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 -import setuptools import os import sys +import setuptools + with open("share/version.txt") as f: version = f.read().strip()