ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 17:42:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/847/capi-fleetcarrier

Browse Source
This commit is contained in:
aussig 2022-12-22 15:32:17 +00:00
commit cb2a6b6995
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EDMarketConnector.py
View File

@ -1329,7 +1329,7 @@ class AppWindow(object):
except companion.CredentialsRequireRefresh: except companion.CredentialsRequireRefresh:
# We need to 'close' the auth else it'll see STATE_OK and think login() isn't needed # 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 # LANG: Frontier CAPI Access Token expired, trying to get a new one
self.status['text'] = _('CAPI: Refreshing access token...') self.status['text'] = _('CAPI: Refreshing access token...')
if companion.session.login(): if companion.session.login():

1
LICENSE
View File

@ -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 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 library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. Public License instead of this License.

14
companion.py
View File

@ -735,6 +735,14 @@ class Session(object):
self.auth = None self.auth = None
raise # Bad thing happened 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: def reinit_session(self, reopen: bool = True) -> None:
""" """
Re-initialise the session's `request.Session()`. Re-initialise the session's `request.Session()`.
@ -742,11 +750,7 @@ class Session(object):
:param reopen: Whether to open a new session. :param reopen: Whether to open a new session.
""" """
self.state = Session.STATE_INIT self.state = Session.STATE_INIT
try: self.close()
self.requests_session.close()
except Exception as e:
logger.debug('Frontier Auth: closing', exc_info=e)
if reopen: if reopen:
self.requests_session = requests.Session() self.requests_session = requests.Session()