diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 0373d4b4..fc4bca2c 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1329,7 +1329,7 @@ class AppWindow(object): except companion.CredentialsRequireRefresh: # We need to 'close' the auth else it'll see STATE_OK and think login() isn't needed - companion.session.close() + companion.session.reinit_session() # LANG: Frontier CAPI Access Token expired, trying to get a new one self.status['text'] = _('CAPI: Refreshing access token...') if companion.session.login(): diff --git a/LICENSE b/LICENSE index 8cdb8451..23cb7903 100644 --- a/LICENSE +++ b/LICENSE @@ -337,4 +337,3 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - diff --git a/companion.py b/companion.py index 49c20057..26f46287 100644 --- a/companion.py +++ b/companion.py @@ -735,6 +735,14 @@ class Session(object): self.auth = None raise # Bad thing happened + def close(self) -> None: + """Close the `request.Session().""" + try: + self.requests_session.close() + + except Exception as e: + logger.debug('Frontier Auth: closing', exc_info=e) + def reinit_session(self, reopen: bool = True) -> None: """ Re-initialise the session's `request.Session()`. @@ -742,11 +750,7 @@ class Session(object): :param reopen: Whether to open a new session. """ self.state = Session.STATE_INIT - try: - self.requests_session.close() - - except Exception as e: - logger.debug('Frontier Auth: closing', exc_info=e) + self.close() if reopen: self.requests_session = requests.Session()