From f449e85c0b42658bd28dd53dc1f32efc078c743d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 13 Jun 2021 12:42:50 +0100 Subject: [PATCH] CAPI: 'SKUError' exception was never used - removed Also LANG comments added. --- EDMC.py | 4 ---- companion.py | 17 +++-------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/EDMC.py b/EDMC.py index 4120fd35..b3e6d0c9 100755 --- a/EDMC.py +++ b/EDMC.py @@ -388,10 +388,6 @@ sys.path: {sys.path}''' logger.error('Frontier CAPI Server returned an error') sys.exit(EXIT_SERVER) - except companion.SKUError: - logger.error('Frontier CAPI Server SKU problem') - sys.exit(EXIT_SERVER) - except companion.CredentialsError: logger.error('Frontier CAPI Server: Invalid Credentials') sys.exit(EXIT_CREDENTIALS) diff --git a/companion.py b/companion.py index f8cf6c26..cd099325 100644 --- a/companion.py +++ b/companion.py @@ -167,6 +167,7 @@ class ServerError(Exception): # Raised when cannot contact the Companion API server self.args = args if not args: + # LANG: Frontier CAPI didn't respond self.args = (_("Error: Frontier CAPI didn't respond"),) @@ -184,22 +185,10 @@ class ServerLagging(Exception): def __init__(self, *args) -> None: self.args = args if not args: + # LANG: Frontier CAPI data doesn't agree with latest Journal location self.args = (_('Error: Frontier server is lagging'),) -class SKUError(Exception): - """Exception Class for CAPI SKU error. - - Raised when the Companion API server thinks that the user has not - purchased E:D i.e. doesn't have the correct 'SKU'. - """ - - def __init__(self, *args) -> None: - self.args = args - if not args: - self.args = (_('Error: Frontier server SKU problem'),) - - class CredentialsError(Exception): """Exception Class for CAPI Credentials error.""" @@ -526,7 +515,7 @@ class Session(object): self.session.headers['User-Agent'] = USER_AGENT self.state = Session.STATE_OK - def query(self, endpoint: str) -> CAPIData: + def query(self, endpoint: str) -> CAPIData: # noqa: CCR001 """Perform a query against the specified CAPI endpoint.""" logger.trace(f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: