Skip to content

Commit c3e2009

Browse files
committed
Refactor get_keys_from_config for simpler conditionals
1 parent efe3d46 commit c3e2009

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

satpy/dataset/id_keys.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import numpy as np
88

99

10-
def get_keys_from_config(common_id_keys, config):
10+
def get_keys_from_config(common_id_keys: dict, config: dict) -> dict:
1111
"""Gather keys for a new DataID from the ones available in configured dataset."""
1212
id_keys = {}
1313
for key, val in common_id_keys.items():
14-
if key in config:
15-
id_keys[key] = val
16-
elif val is not None and (val.get("required") is True or val.get("default") is not None):
14+
has_key = key in config
15+
is_required_or_default = val is not None and (val.get("required") is True or val.get("default") is not None)
16+
if has_key or is_required_or_default:
1717
id_keys[key] = val
1818
if not id_keys:
1919
raise ValueError("Metadata does not contain enough information to create a DataID.")

0 commit comments

Comments
 (0)