Run linter

client/securedrop_client/export.py

@@ -7,7 +7,7 @@
 from enum import Enum
 from io import BytesIO
 from shlex import quote
-from tempfile import mkdtemp, TemporaryDirectory
+from tempfile import TemporaryDirectory, mkdtemp
 from typing import Callable, List, Optional
 
 from PyQt5.QtCore import QObject, QProcess, pyqtSignal
@@ -16,6 +16,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class Export(QObject):
     """
     Interface for sending files to Export VM for transfer to a
@@ -86,7 +87,6 @@ def run_printer_preflight_checks(self) -> None:
             logger.error(f"Error creating archive: {e}")
             self._on_print_prefight_error()
 
-
     def run_export_preflight_checks(self) -> None:
         """
         Run preflight check to verify that a valid USB device is connected.
@@ -338,7 +338,12 @@ def print(self, filepaths: List[str]) -> None:
                 self.print_failed.emit(ExportError(ExportStatus.ERROR_PRINT))
 
     def _create_archive(
-        self, archive_dir: str, archive_fn: str, metadata: dict, filepaths: List[str] = [], whistleflow: bool = False
+        self,
+        archive_dir: str,
+        archive_fn: str,
+        metadata: dict,
+        filepaths: List[str] = [],
+        whistleflow: bool = False,
     ) -> str:
         """
         Create the archive to be sent to the Export VM.
@@ -377,9 +382,7 @@ def _create_archive(
                     # so this shouldn't be reachable
                     logger.warning("File not found at specified filepath, skipping")
                 else:
-                    self._add_file_to_archive(
-                        archive, filepath, prevent_name_collisions
-                    )
+                    self._add_file_to_archive(archive, filepath, prevent_name_collisions)
             if missing_count == len(filepaths) and missing_count > 0:
                 # Context manager will delete archive even if an exception occurs
                 # since the archive is in a TemporaryDirectory
@@ -480,13 +483,12 @@ def send_files_to_whistleflow(self, filename: str, filepaths: List[str]) -> None
 
         self.export_completed.emit(filepaths)
 
-
     def _run_whistleflow_view_test(self) -> None:
         # TODO fill this in
         logger.info("Running dummy whistleflow view test")
 
     def _run_whistleflow_export(
-            self, archive_dir: str, filename: str, filepaths: List[str]
+        self, archive_dir: str, filename: str, filepaths: List[str]
     ) -> None:
         """
         Run disk-test.
@@ -511,9 +513,7 @@ def run_whistleflow_preflight_checks(self) -> None:
         Run dummy preflight test
         """
         try:
-            logger.debug(
-                "beginning whistleflow preflight checks"
-            )
+            logger.debug("beginning whistleflow preflight checks")
             self._run_whistleflow_view_test()
 
             logger.debug("completed preflight checks: success")
@@ -526,5 +526,3 @@ def run_whistleflow_preflight_checks(self) -> None:
 class ExportDestination(Enum):
     USB = "USB"
     WHISTLEFLOW = "WHISTLEFLOW"
-
-

client/securedrop_client/gui/actions.py

@@ -16,14 +16,13 @@
 from securedrop_client import state
 from securedrop_client.conversation import Transcript as ConversationTranscript
 from securedrop_client.db import Source
-from securedrop_client.export import ExportDestination
-from securedrop_client.export import Export
+from securedrop_client.export import Export, ExportDestination
 from securedrop_client.gui.base import ModalDialog
 from securedrop_client.gui.conversation import (
     PrintTranscriptDialog as PrintConversationTranscriptDialog,
 )
-from securedrop_client.gui.conversation.export.whistleflow_dialog import WhistleflowDialog
 from securedrop_client.gui.conversation.export import ExportWizard
+from securedrop_client.gui.conversation.export.whistleflow_dialog import WhistleflowDialog
 from securedrop_client.logic import Controller
 from securedrop_client.utils import safe_mkdir
 
@@ -111,7 +110,7 @@ class DeleteSourcesAction(QAction):
 
     def __init__(
         self,
-        parent: 'SourceListToolbar',
+        parent: "SourceListToolbar",
         controller: Controller,
         confirmation_dialog: Callable[[List[str]], QDialog],
     ) -> None:
@@ -401,7 +400,6 @@ def _prepare_to_export(self) -> None:
                 )
                 wizard.exec()
 
-
     def _on_confirmation_dialog_accepted(self) -> None:
         self._prepare_to_export()
 

client/securedrop_client/gui/auth/__init__.py

@@ -16,6 +16,7 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
+
 from securedrop_client.gui.auth.dialog import LoginDialog
 
-__all__ = ["LoginDialog"]
+__all__ = ["LoginDialog"]

client/securedrop_client/gui/conversation/export/whistleflow_dialog.py

@@ -2,6 +2,7 @@
 A dialog that allows journalists to export conversations or transcripts to the
 Whistleflow View VM. This is a clone of FileDialog.
 """
+
 import datetime
 import logging
 from gettext import gettext as _
@@ -96,7 +97,9 @@ def _send_to_whistleflow(self) -> None:
         # self._device.whistleflow_export_requested.emit(
         #     "export-{}.tar".format(timestamp), self._file_locations
         # )
-        self._device.send_files_to_whistleflow( "export-{}.tar".format(timestamp), self._file_locations)
+        self._device.send_files_to_whistleflow(
+            "export-{}.tar".format(timestamp), self._file_locations
+        )
 
     def _show_success_message(self) -> None:
         self.continue_button.clicked.disconnect()

client/securedrop_client/gui/widgets.py

@@ -73,8 +73,7 @@
     Source,
     User,
 )
-from securedrop_client.export import ExportDestination
-from securedrop_client.export import Export
+from securedrop_client.export import Export, ExportDestination
 from securedrop_client.gui import conversation
 from securedrop_client.gui.actions import (
     DeleteConversationAction,

client/tests/functional/test_delete_sources.py

@@ -1,6 +1,7 @@
 """
 Functional tests for deleting multiple sources in the SecureDrop client.
 """
+
 import pytest
 from flaky import flaky
 from PyQt5.QtWidgets import QCheckBox