mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-28 09:52:37 +02:00
chore(imports): remove useless imports
As detected by [ruff](https://github.com/astral-sh/ruff) Related to #254, although it doesn't provide the command to lint the codebase itself.
This commit is contained in:
parent
850199c2a3
commit
5aa4863b52
35 changed files with 14 additions and 81 deletions
|
@ -13,4 +13,4 @@ else:
|
||||||
if mode == "cli":
|
if mode == "cli":
|
||||||
from .cli import cli_main as main
|
from .cli import cli_main as main
|
||||||
else:
|
else:
|
||||||
from .gui import gui_main as main
|
from .gui import gui_main as main # noqa: F401
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
from typing import Any, Callable, List, Optional, TypeVar
|
from typing import List, Optional
|
||||||
|
|
||||||
import click
|
import click
|
||||||
from colorama import Back, Fore, Style
|
from colorama import Back, Fore, Style
|
||||||
|
|
|
@ -1,14 +1,8 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import glob
|
|
||||||
import json
|
|
||||||
import os
|
import os
|
||||||
import re
|
|
||||||
import shutil
|
|
||||||
import subprocess
|
|
||||||
import sys
|
import sys
|
||||||
import time
|
|
||||||
from abc import abstractmethod
|
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
|
DEFAULT_DPI = 150 # Pixels per inch
|
||||||
INT_BYTES = 2
|
INT_BYTES = 2
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import glob
|
|
||||||
import os
|
import os
|
||||||
import re
|
|
||||||
import shutil
|
|
||||||
import sys
|
import sys
|
||||||
from typing import Dict, List, Optional, TextIO
|
from typing import Dict, Optional
|
||||||
|
|
||||||
import fitz
|
import fitz
|
||||||
import magic
|
import magic
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import subprocess
|
|
||||||
from typing import List, Optional, Type, Union
|
from typing import List, Optional, Type, Union
|
||||||
|
|
||||||
# XXX: errors start at 128 for conversion-related issues
|
# XXX: errors start at 128 for conversion-related issues
|
||||||
|
|
|
@ -11,7 +11,6 @@ import glob
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import shutil
|
|
||||||
import sys
|
import sys
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
import enum
|
import enum
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import platform
|
|
||||||
import secrets
|
import secrets
|
||||||
import stat
|
|
||||||
import tempfile
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
import appdirs
|
|
||||||
|
|
||||||
from . import errors, util
|
from . import errors, util
|
||||||
|
|
||||||
SAFE_EXTENSION = "-safe.pdf"
|
SAFE_EXTENSION = "-safe.pdf"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import functools
|
import functools
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
from typing import Any, Callable, Sequence, TypeVar, cast
|
from typing import Any, Callable, TypeVar, cast
|
||||||
|
|
||||||
import click
|
import click
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
import enum
|
import enum
|
||||||
import functools
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
import signal
|
import signal
|
||||||
import sys
|
import sys
|
||||||
import typing
|
import typing
|
||||||
import uuid
|
|
||||||
from typing import Dict, List, Optional
|
from typing import Dict, List, Optional
|
||||||
|
|
||||||
import click
|
import click
|
||||||
|
|
|
@ -25,7 +25,6 @@ if platform.system() == "Linux":
|
||||||
|
|
||||||
from ..isolation_provider.base import IsolationProvider
|
from ..isolation_provider.base import IsolationProvider
|
||||||
from ..logic import DangerzoneCore
|
from ..logic import DangerzoneCore
|
||||||
from ..settings import Settings
|
|
||||||
from ..util import get_resource_path, replace_control_chars
|
from ..util import get_resource_path, replace_control_chars
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
import json
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
import shutil
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import typing
|
import typing
|
||||||
from multiprocessing.pool import ThreadPool
|
from multiprocessing.pool import ThreadPool
|
||||||
from typing import Dict, List, Optional
|
from typing import List, Optional
|
||||||
|
|
||||||
from colorama import Fore, Style
|
|
||||||
|
|
||||||
# FIXME: See https://github.com/freedomofpress/dangerzone/issues/320 for more details.
|
# FIXME: See https://github.com/freedomofpress/dangerzone/issues/320 for more details.
|
||||||
if typing.TYPE_CHECKING:
|
if typing.TYPE_CHECKING:
|
||||||
|
|
|
@ -6,7 +6,7 @@ import platform
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import typing
|
import typing
|
||||||
from typing import Any, Optional
|
from typing import Optional
|
||||||
|
|
||||||
from packaging import version
|
from packaging import version
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ else:
|
||||||
|
|
||||||
# XXX implict import for "markdown" module required for Cx_Freeze to build on Windows
|
# XXX implict import for "markdown" module required for Cx_Freeze to build on Windows
|
||||||
# See https://github.com/freedomofpress/dangerzone/issues/501
|
# See https://github.com/freedomofpress/dangerzone/issues/501
|
||||||
import html.parser
|
import html.parser # noqa: F401
|
||||||
|
|
||||||
import markdown
|
import markdown
|
||||||
import requests
|
import requests
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import contextlib
|
import contextlib
|
||||||
import logging
|
import logging
|
||||||
import os
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
|
@ -11,7 +11,7 @@ from typing import Any, List, Optional
|
||||||
|
|
||||||
from ..conversion import errors
|
from ..conversion import errors
|
||||||
from ..document import Document
|
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
|
from .base import PIXELS_TO_PDF_LOG_END, PIXELS_TO_PDF_LOG_START, IsolationProvider
|
||||||
|
|
||||||
# Define startupinfo for subprocesses
|
# Define startupinfo for subprocesses
|
||||||
|
|
|
@ -4,7 +4,6 @@ import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
from pathlib import Path
|
|
||||||
from typing import Callable, Optional
|
from typing import Callable, Optional
|
||||||
|
|
||||||
from ..document import Document
|
from ..document import Document
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import inspect
|
|
||||||
import io
|
import io
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
@ -8,7 +7,7 @@ import subprocess
|
||||||
import sys
|
import sys
|
||||||
import zipfile
|
import zipfile
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import IO, Callable, Optional
|
from typing import IO, Optional
|
||||||
|
|
||||||
from ..conversion import errors
|
from ..conversion import errors
|
||||||
from ..conversion.common import running_on_qubes
|
from ..conversion.common import running_on_qubes
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
import concurrent.futures
|
import concurrent.futures
|
||||||
import gzip
|
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import pathlib
|
|
||||||
import platform
|
|
||||||
import shutil
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
from typing import Callable, List, Optional
|
from typing import Callable, List, Optional
|
||||||
|
|
||||||
import colorama
|
import colorama
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from typing import TYPE_CHECKING, Any, Dict, Optional
|
from typing import TYPE_CHECKING, Any, Dict
|
||||||
|
|
||||||
from packaging import version
|
from packaging import version
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import pathlib
|
import pathlib
|
||||||
import platform
|
import platform
|
||||||
import string
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import unicodedata
|
import unicodedata
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import functools
|
|
||||||
import os
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
import re
|
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
|
@ -2,12 +2,9 @@
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import getpass
|
import getpass
|
||||||
import inspect
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import pathlib
|
|
||||||
import sys
|
import sys
|
||||||
import urllib
|
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import glob
|
|
||||||
import io
|
|
||||||
import os
|
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
import zipfile
|
|
||||||
|
|
||||||
|
|
||||||
def say(msg):
|
def say(msg):
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
import os
|
|
||||||
|
|
||||||
from cx_Freeze import Executable, setup
|
from cx_Freeze import Executable, setup
|
||||||
|
|
||||||
with open("share/version.txt") as f:
|
with open("share/version.txt") as f:
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -1,6 +1,5 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
|
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from pytest import MonkeyPatch
|
from pytest import MonkeyPatch
|
||||||
|
|
|
@ -2,9 +2,8 @@ import os
|
||||||
import pathlib
|
import pathlib
|
||||||
import shutil
|
import shutil
|
||||||
import time
|
import time
|
||||||
import typing
|
|
||||||
|
|
||||||
from PySide6 import QtCore, QtWidgets
|
from PySide6 import QtCore
|
||||||
from pytest import MonkeyPatch, fixture
|
from pytest import MonkeyPatch, fixture
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
from pytestqt.qtbot import QtBot
|
from pytestqt.qtbot import QtBot
|
||||||
|
@ -15,7 +14,6 @@ from dangerzone.gui import updater as updater_module
|
||||||
from dangerzone.gui.logic import DangerzoneGui
|
from dangerzone.gui.logic import DangerzoneGui
|
||||||
from dangerzone.gui.main_window import ContentWidget
|
from dangerzone.gui.main_window import ContentWidget
|
||||||
from dangerzone.gui.updater import UpdateReport, UpdaterThread
|
from dangerzone.gui.updater import UpdateReport, UpdaterThread
|
||||||
from dangerzone.util import get_version
|
|
||||||
|
|
||||||
from .. import sample_doc, sample_pdf
|
from .. import sample_doc, sample_pdf
|
||||||
from . import qt_updater as updater
|
from . import qt_updater as updater
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
import json
|
import json
|
||||||
import os
|
|
||||||
import platform
|
import platform
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import typing
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -13,7 +11,6 @@ from pytest_mock import MockerFixture
|
||||||
from pytestqt.qtbot import QtBot
|
from pytestqt.qtbot import QtBot
|
||||||
|
|
||||||
from dangerzone import settings
|
from dangerzone import settings
|
||||||
from dangerzone.gui import MainWindow
|
|
||||||
from dangerzone.gui import updater as updater_module
|
from dangerzone.gui import updater as updater_module
|
||||||
from dangerzone.gui.updater import UpdateReport, UpdaterThread
|
from dangerzone.gui.updater import UpdateReport, UpdaterThread
|
||||||
from dangerzone.util import get_version
|
from dangerzone.util import get_version
|
||||||
|
|
|
@ -2,8 +2,6 @@ import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from colorama import Style
|
|
||||||
from pytest import MonkeyPatch
|
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
from dangerzone.conversion import errors
|
from dangerzone.conversion import errors
|
||||||
|
|
|
@ -1,15 +1,9 @@
|
||||||
import itertools
|
|
||||||
import json
|
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import time
|
import time
|
||||||
from typing import Any, Dict
|
|
||||||
|
|
||||||
import pytest
|
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.container import Container
|
||||||
from dangerzone.isolation_provider.qubes import is_qubes_native_conversion
|
from dangerzone.isolation_provider.qubes import is_qubes_native_conversion
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ from dangerzone.document import Document
|
||||||
from dangerzone.isolation_provider.base import IsolationProvider
|
from dangerzone.isolation_provider.base import IsolationProvider
|
||||||
from dangerzone.isolation_provider.dummy import Dummy
|
from dangerzone.isolation_provider.dummy import Dummy
|
||||||
|
|
||||||
from .base import IsolationProviderTermination, IsolationProviderTest
|
from .base import IsolationProviderTermination
|
||||||
|
|
||||||
|
|
||||||
class DummyWait(Dummy):
|
class DummyWait(Dummy):
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import os
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
import signal
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
@ -10,7 +9,6 @@ from pytest_mock import MockerFixture
|
||||||
|
|
||||||
from dangerzone.conversion import errors
|
from dangerzone.conversion import errors
|
||||||
from dangerzone.document import Document
|
from dangerzone.document import Document
|
||||||
from dangerzone.isolation_provider.base import IsolationProvider
|
|
||||||
from dangerzone.isolation_provider.qubes import (
|
from dangerzone.isolation_provider.qubes import (
|
||||||
Qubes,
|
Qubes,
|
||||||
is_qubes_native_conversion,
|
is_qubes_native_conversion,
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import base64
|
import base64
|
||||||
import contextlib
|
|
||||||
import copy
|
import copy
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
import re
|
|
||||||
import shutil
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
import stat
|
|
||||||
import tempfile
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ import os
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import time
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import collections
|
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
@ -7,7 +6,7 @@ from unittest.mock import PropertyMock
|
||||||
import pytest
|
import pytest
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
from dangerzone.settings import *
|
from dangerzone.settings import SETTINGS_FILENAME, Settings
|
||||||
|
|
||||||
|
|
||||||
def default_settings_0_4_1() -> dict:
|
def default_settings_0_4_1() -> dict:
|
||||||
|
|
Loading…
Reference in a new issue