NXDRIVE-2711: Sourcery refactored

nxdrive/client/uploader/__init__.py

@@ -451,12 +451,11 @@ def link_blob_to_doc(
             kwargs["headers"] = headers
         try:
             doc_type = kwargs.get("doc_type", "")
-            if transfer.is_direct_transfer and doc_type and doc_type != "":
-                res = self._transfer_docType_file(transfer, headers, doc_type)
-            else:
-                res = self._transfer_autoType_file(command, blob, kwargs)
-
-            return res
+            return (
+                self._transfer_docType_file(transfer, headers, doc_type)
+                if transfer.is_direct_transfer and doc_type and doc_type != ""
+                else self._transfer_autoType_file(command, blob, kwargs)
+            )
         except Exception as exc:
             err = f"Error while linking blob to doc: {exc!r}"
             log.warning(err)

nxdrive/engine/activity.py

@@ -54,8 +54,7 @@ def get_current_action(*, thread_id: int = None) -> Optional["Action"]:
 
     @staticmethod
     def finish_action() -> None:
-        action = Action.actions.pop(current_thread_id(), None)
-        if action:
+        if action := Action.actions.pop(current_thread_id(), None):
             action.finish()
 
     def finish(self) -> None:

tests/unit/test_client_uploader.py

@@ -13,8 +13,7 @@
 def baseuploader():
     remote = Remote
     remote.dao = Mock()
-    baseuploader = BaseUploader(remote)
-    return baseuploader
+    return BaseUploader(remote)
 
 
 def test_link_blob_to_doc(baseuploader, upload, tmp_path, monkeypatch):

tests/unit/test_engine_dao.py

@@ -409,7 +409,7 @@ def test_migration_db_v10(engine_dao):
     """Verify Downloads after migration from v9 to v10."""
     with engine_dao("engine_migration_10.db") as dao:
         downloads = list(dao.get_downloads())
-        assert len(downloads) == 0
+        assert not downloads
 
         states = list(dao.get_states_from_partial_local(Path()))
         assert len(states) == 4