From 71afce69d03ad5166a5b6516beab9d27bf51538c Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Fri, 10 Sep 2021 11:35:30 -0400 Subject: [PATCH] Append paper account last when loading --- piker/config.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/piker/config.py b/piker/config.py index 2d1a948b..70d9c9c5 100644 --- a/piker/config.py +++ b/piker/config.py @@ -107,20 +107,17 @@ def write( def load_accounts( - provider: Optional[str] = None + providers: Optional[list[str]] = None ) -> bidict[str, Optional[str]]: - # our default paper engine entry - accounts = bidict({'paper': None}) - conf, path = load() - + accounts = bidict() for provider_name, section in conf.items(): accounts_section = section.get('accounts') if ( - provider is None or - provider and provider_name == provider + providers is None or + providers and provider_name in providers ): if accounts_section is None: log.warning(f'No accounts named for {provider_name}?') @@ -131,4 +128,6 @@ def load_accounts( f'{provider_name}.{label}' ] = value + # our default paper engine entry + accounts['paper'] = None return accounts