chore(imports): remove useless imports

As detected by [ruff](https://github.com/astral-sh/ruff)

Related to freedomofpress#254, although it doesn't provide the command to lint the
codebase itself.

dangerzone/__init__.py

@@ -13,4 +13,4 @@
 if mode == "cli":
     from .cli import cli_main as main
 else:
-    from .gui import gui_main as main
+    from .gui import gui_main as main  # NOQA

dangerzone/cli.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-from typing import Any, Callable, List, Optional, TypeVar
+from typing import List, Optional
 
 import click
 from colorama import Back, Fore, Style

dangerzone/conversion/common.py

@@ -1,16 +1,10 @@
 #!/usr/bin/env python3
 
 import asyncio
-import glob
-import json
 import os
-import re
-import shutil
-import subprocess
 import sys
-import time
 from abc import abstractmethod
-from typing import Callable, Dict, List, Optional, TextIO, Tuple, Union
+from typing import Callable, List, Optional, TextIO, Tuple
 
 DEFAULT_DPI = 150  # Pixels per inch
 INT_BYTES = 2

dangerzone/conversion/doc_to_pixels.py

@@ -1,11 +1,8 @@
 #!/usr/bin/env python3
 import asyncio
-import glob
 import os
-import re
-import shutil
 import sys
-from typing import Dict, List, Optional, TextIO
+from typing import Dict, Optional
 
 import fitz
 import magic

dangerzone/conversion/errors.py

@@ -1,4 +1,3 @@
-import subprocess
 from typing import List, Optional, Type, Union
 
 # XXX: errors start at 128 for conversion-related issues

dangerzone/conversion/pixels_to_pdf.py

@@ -11,7 +11,6 @@
 import io
 import json
 import os
-import shutil
 import sys
 from typing import Optional
 

dangerzone/document.py

@@ -1,15 +1,10 @@
 import enum
 import logging
 import os
-import platform
 import secrets
-import stat
-import tempfile
 from pathlib import Path
 from typing import Optional
 
-import appdirs
-
 from . import errors, util
 
 SAFE_EXTENSION = "-safe.pdf"

dangerzone/errors.py

@@ -1,7 +1,7 @@
 import functools
 import logging
 import sys
-from typing import Any, Callable, Sequence, TypeVar, cast
+from typing import Any, Callable, TypeVar, cast
 
 import click
 

dangerzone/gui/__init__.py

@@ -1,12 +1,10 @@
 import enum
-import functools
 import logging
 import os
 import platform
 import signal
 import sys
 import typing
-import uuid
 from typing import Dict, List, Optional
 
 import click

dangerzone/gui/logic.py

@@ -25,7 +25,6 @@
 
 from ..isolation_provider.base import IsolationProvider
 from ..logic import DangerzoneCore
-from ..settings import Settings
 from ..util import get_resource_path, replace_control_chars
 
 log = logging.getLogger(__name__)

dangerzone/gui/main_window.py

@@ -1,15 +1,11 @@
-import json
 import logging
 import os
 import platform
-import shutil
 import subprocess
 import tempfile
 import typing
 from multiprocessing.pool import ThreadPool
-from typing import Dict, List, Optional
-
-from colorama import Fore, Style
+from typing import List, Optional
 
 # FIXME: See https://github.com/freedomofpress/dangerzone/issues/320 for more details.
 if typing.TYPE_CHECKING:

dangerzone/gui/updater.py

@@ -6,7 +6,7 @@
 import sys
 import time
 import typing
-from typing import Any, Optional
+from typing import Optional
 
 from packaging import version
 
@@ -20,7 +20,7 @@
 
 # XXX implict import for "markdown" module required for Cx_Freeze to build on Windows
 # See https://github.com/freedomofpress/dangerzone/issues/501
-import html.parser
+import html.parser  # NOQA
 
 import markdown
 import requests

dangerzone/isolation_provider/base.py

@@ -1,6 +1,5 @@
 import contextlib
 import logging
-import os
 import subprocess
 import sys
 import tempfile

dangerzone/isolation_provider/container.py

@@ -11,7 +11,7 @@
 
 from ..conversion import errors
 from ..document import Document
-from ..util import get_resource_path, get_subprocess_startupinfo, get_tmp_dir
+from ..util import get_resource_path, get_subprocess_startupinfo
 from .base import PIXELS_TO_PDF_LOG_END, PIXELS_TO_PDF_LOG_START, IsolationProvider
 
 # Define startupinfo for subprocesses

dangerzone/isolation_provider/dummy.py

@@ -4,7 +4,6 @@
 import subprocess
 import sys
 import time
-from pathlib import Path
 from typing import Callable, Optional
 
 from ..document import Document

dangerzone/isolation_provider/qubes.py

@@ -1,5 +1,4 @@
 import asyncio
-import inspect
 import io
 import logging
 import os
@@ -8,7 +7,7 @@
 import sys
 import zipfile
 from pathlib import Path
-from typing import IO, Callable, Optional
+from typing import IO, Optional
 
 from ..conversion import errors
 from ..conversion.common import running_on_qubes

dangerzone/logic.py

@@ -1,12 +1,6 @@
 import concurrent.futures
-import gzip
 import json
 import logging
-import pathlib
-import platform
-import shutil
-import subprocess
-import sys
 from typing import Callable, List, Optional
 
 import colorama

dangerzone/settings.py

@@ -1,7 +1,7 @@
 import json
 import logging
 import os
-from typing import TYPE_CHECKING, Any, Dict, Optional
+from typing import TYPE_CHECKING, Any, Dict
 
 from packaging import version
 

dangerzone/util.py

@@ -1,6 +1,5 @@
 import pathlib
 import platform
-import string
 import subprocess
 import sys
 import unicodedata

dev_scripts/env.py

@@ -1,10 +1,8 @@
 #!/usr/bin/env python3
 
 import argparse
-import functools
 import os
 import pathlib
-import re
 import shutil
 import subprocess
 import sys

dev_scripts/upload-asset.py

@@ -2,12 +2,9 @@
 
 import argparse
 import getpass
-import inspect
 import logging
 import os
-import pathlib
 import sys
-import urllib
 
 import requests
 

qubes/dz.ConvertDev

@@ -1,12 +1,8 @@
 #!/usr/bin/env python3
 
 import asyncio
-import glob
-import io
-import os
 import sys
 import tempfile
-import zipfile
 
 
 def say(msg):

setup-windows.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python3
-import os
-
 from cx_Freeze import Executable, setup
 
 with open("share/version.txt") as f:

setup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import os
-import sys
 
 import setuptools
 

tests/gui/__init__.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 from typing import Optional
-from unittest import mock
 
 import pytest
 from pytest import MonkeyPatch

tests/gui/test_main_window.py

@@ -2,9 +2,8 @@
 import pathlib
 import shutil
 import time
-import typing
 
-from PySide6 import QtCore, QtWidgets
+from PySide6 import QtCore
 from pytest import MonkeyPatch, fixture
 from pytest_mock import MockerFixture
 from pytestqt.qtbot import QtBot
@@ -15,7 +14,6 @@
 from dangerzone.gui.logic import DangerzoneGui
 from dangerzone.gui.main_window import ContentWidget
 from dangerzone.gui.updater import UpdateReport, UpdaterThread
-from dangerzone.util import get_version
 
 from .. import sample_doc, sample_pdf
 from . import qt_updater as updater

tests/gui/test_updater.py

@@ -1,9 +1,7 @@
 import json
-import os
 import platform
 import sys
 import time
-import typing
 from pathlib import Path
 
 import pytest
@@ -13,7 +11,6 @@
 from pytestqt.qtbot import QtBot
 
 from dangerzone import settings
-from dangerzone.gui import MainWindow
 from dangerzone.gui import updater as updater_module
 from dangerzone.gui.updater import UpdateReport, UpdaterThread
 from dangerzone.util import get_version

tests/isolation_provider/base.py

@@ -2,8 +2,6 @@
 import subprocess
 
 import pytest
-from colorama import Style
-from pytest import MonkeyPatch
 from pytest_mock import MockerFixture
 
 from dangerzone.conversion import errors

tests/isolation_provider/test_container.py

@@ -1,15 +1,9 @@
-import itertools
-import json
 import os
 import subprocess
 import time
-from typing import Any, Dict
 
 import pytest
-from pytest_mock import MockerFixture
 
-from dangerzone.document import Document
-from dangerzone.isolation_provider import base
 from dangerzone.isolation_provider.container import Container
 from dangerzone.isolation_provider.qubes import is_qubes_native_conversion
 

tests/isolation_provider/test_dummy.py

@@ -9,7 +9,7 @@
 from dangerzone.isolation_provider.base import IsolationProvider
 from dangerzone.isolation_provider.dummy import Dummy
 
-from .base import IsolationProviderTermination, IsolationProviderTest
+from .base import IsolationProviderTermination
 
 
 class DummyWait(Dummy):

tests/isolation_provider/test_qubes.py

@@ -1,6 +1,5 @@
 import os
 import pathlib
-import signal
 import subprocess
 import time
 
@@ -10,7 +9,6 @@
 
 from dangerzone.conversion import errors
 from dangerzone.document import Document
-from dangerzone.isolation_provider.base import IsolationProvider
 from dangerzone.isolation_provider.qubes import (
     Qubes,
     is_qubes_native_conversion,

tests/test_cli.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
 import base64
-import contextlib
 import copy
 import os
 import platform
-import re
 import shutil
 import sys
 import tempfile

tests/test_document.py

@@ -1,7 +1,5 @@
 import os
 import platform
-import stat
-import tempfile
 from pathlib import Path
 from unittest.mock import MagicMock
 

tests/test_large_set.py

@@ -2,7 +2,6 @@
 import re
 import subprocess
 import sys
-import time
 from pathlib import Path
 from typing import List
 

tests/test_settings.py

@@ -1,4 +1,3 @@
-import collections
 import json
 import os
 from pathlib import Path
@@ -7,7 +6,7 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from dangerzone.settings import *
+from dangerzone.settings import SETTINGS_FILENAME, Settings
 
 
 def default_settings_0_4_1() -> dict: