From 14d1a0ad5efb151f267b8ffebc6664f08f482a67 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Tue, 15 Sep 2020 17:30:23 +0100
Subject: [PATCH] companion.py: Re-format next(...) to be more obvious.
---
companion.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/companion.py b/companion.py
index 2d4ba73c..3ed92e7b 100644
--- a/companion.py
+++ b/companion.py
@@ -300,7 +300,8 @@ class Auth(object):
if not data.get('code'):
logger.error(f'Frontier CAPI Auth: Negative response (no "code" in returned data)\n{payload}\n')
error = next(
- (data[k] for k in ('error_description', 'error', 'message') if k in data), ('<unknown error>',)
+ (data[k] for k in ('error_description', 'error', 'message') if k in data),
+ '<unknown error>'
)
raise CredentialsError(f'Error: {error!r}')
@@ -338,7 +339,10 @@ class Auth(object):
logger.error(f"Frontier CAPI Auth: Can't get token for \"{self.cmdr}\"")
self.dump(r)
- error = next((data[k] for k in ('error_description', 'error', 'message') if k in data), ('<unknown error>',))
+ error = next(
+ (data[k] for k in ('error_description', 'error', 'message') if k in data),
+ '<unknown error>'
+ )
raise CredentialsError(f'Error: {error!r}')
@staticmethod