sort imports with isort linter

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

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):

dangerzone/common.py

@@ -1,7 +1,8 @@
 import os
-import stat
 import platform
+import stat
 import tempfile
+
 import appdirs
 
 

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?

dangerzone/global_common.py

@@ -1,17 +1,20 @@
-import sys
+import gzip
-import appdirs
+import inspect
+import json
+import logging
+import os
 import pathlib
 import platform
-import subprocess
 import shutil
-import json
+import subprocess
-import gzip
+import sys
-import colorama
+
-from colorama import Fore, Back, Style
+import appdirs
-import logging
+import colorama
+from colorama import Back, Fore, Style
 
-from .settings import Settings
 from .container import convert
+from .settings import Settings
 
 log = logging.getLogger(__name__)
 

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

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

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

dangerzone/gui/systray.py

@@ -1,4 +1,5 @@
 import platform
+
 from PySide2 import QtWidgets
 
 

dangerzone/settings.py

@@ -1,7 +1,6 @@
-import os
 import json
-import appdirs
 import logging
+import os
 
 log = logging.getLogger(__name__)
 

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

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(

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(

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(

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()

install/windows/build-image.py

@@ -1,6 +1,6 @@
-import subprocess
 import gzip
 import os
+import subprocess
 
 
 def main():

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()

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()