Simplify retrieve/keep_local with dict.get() method

MattMonk · MattMonk · commit da760f770cec · 2025-03-14T11:52:56.000+01:00
diff --git a/src/snakemake/storage.py b/src/snakemake/storage.py
@@ -95,15 +95,11 @@ def register_storage(
                 f"{plugin.name} is not."
             )
 
-        keep_local = (
-            settings["keep_local"]
-            if "keep_local" in settings
-            else self.workflow.storage_settings.keep_storage_local
+        keep_local = settings.get(
+            "keep_local", self.workflow.storage_settings.keep_storage_local
         )
-        retrieve = (
-            settings["retrieve"]
-            if "retrieve" in settings
-            else self.workflow.storage_settings.retrieve_storage
+        retrieve = settings.get(
+            "retrieve", self.workflow.storage_settings.retrieve_storage
         )
         provider_instance = plugin.storage_provider(
             local_prefix=local_prefix,

Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,11 @@ def register_storage(`
`95`	`95`	`f"{plugin.name} is not."`
`96`	`96`	`)`
`97`	`97`
`98`		`- keep_local = (`
`99`		`- settings["keep_local"]`
`100`		`- if "keep_local" in settings`
`101`		`- else self.workflow.storage_settings.keep_storage_local`
	`98`	`+ keep_local = settings.get(`
	`99`	`+ "keep_local", self.workflow.storage_settings.keep_storage_local`
`102`	`100`	`)`
`103`		`- retrieve = (`
`104`		`- settings["retrieve"]`
`105`		`- if "retrieve" in settings`
`106`		`- else self.workflow.storage_settings.retrieve_storage`
	`101`	`+ retrieve = settings.get(`
	`102`	`+ "retrieve", self.workflow.storage_settings.retrieve_storage`
`107`	`103`	`)`
`108`	`104`	`provider_instance = plugin.storage_provider(`
`109`	`105`	`local_prefix=local_prefix,`