From 4ee88694261191089073eed796e079055ad34292 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 13 Jul 2020 08:10:52 +0200 Subject: [PATCH] Revert part of e510b783 Apparently config.get does _not_ take a default param. It really should. --- EDMC.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EDMC.py b/EDMC.py index 1f3ae1c5..8001dacb 100755 --- a/EDMC.py +++ b/EDMC.py @@ -98,7 +98,7 @@ def main(): else: # Get state from latest Journal file try: - logdir = config.get('journaldir', config.default_journal_dir) + logdir = config.get('journaldir') or config.default_journal_dir logfiles = sorted((x for x in os.listdir(logdir) if JOURNAL_RE.search(x)), key=lambda x: x.split('.')[1:]) logfile = join(logdir, logfiles[-1]) @@ -121,7 +121,7 @@ def main(): # Get data from Companion API if args.p: - cmdrs = config.get('cmdrs', []) + cmdrs = config.get('cmdrs') or [] if args.p in cmdrs: idx = cmdrs.index(args.p) @@ -135,7 +135,7 @@ def main(): companion.session.login(cmdrs[idx], monitor.is_beta) else: - cmdrs = config.get('cmdrs', []) + cmdrs = config.get('cmdrs') or [] if monitor.cmdr not in cmdrs: raise companion.CredentialsError()