mirror of
https://github.com/EDCD/EDMarketConnector.git
synced 2026-11-20 03:02:40 +03:00
Fix up companion.Session.close() refactor
* When PyCharm made a mess I accidentally undid two renames in EDMarketConnector.py... * ... but one of those actually *does* need to only close the session. So made a new Session.close() that performs only the closing, with Session.reinit_session() now utilising that.
This commit is contained in:
2 files changed
+10
-6
No files matched your search
@@ -1253,7 +1253,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():
|
||||
|
||||
+9
-5
@@ -732,6 +732,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()`.
|
||||
@@ -739,11 +747,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()
|
||||
|
||||
Reference in new issue
Block a user