From 1f45752ac2db45470468ed7e4ddaa7e88cd4d074 Mon Sep 17 00:00:00 2001 From: CastagnaIT Date: Wed, 20 Sep 2023 17:01:50 +0200 Subject: [PATCH] Revert some changes --- resources/lib/services/nfsession/session/cookie.py | 2 +- resources/lib/utils/cookies.py | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/resources/lib/services/nfsession/session/cookie.py b/resources/lib/services/nfsession/session/cookie.py index 84fa6281a..fda367189 100644 --- a/resources/lib/services/nfsession/session/cookie.py +++ b/resources/lib/services/nfsession/session/cookie.py @@ -41,7 +41,7 @@ def _verify_session_cookies(self): if not self.session.cookies: return False for cookie_name in LOGIN_COOKIES: - if cookie_name not in list(self.session.cookies.keys()): + if not any(cookie.name == cookie_name for cookie in list(self.session.cookies)): LOG.error('The cookie "{}" do not exist, it is not possible to check the expiration', cookie_name) return False diff --git a/resources/lib/utils/cookies.py b/resources/lib/utils/cookies.py index 85cf997f2..c273bb859 100644 --- a/resources/lib/utils/cookies.py +++ b/resources/lib/utils/cookies.py @@ -50,10 +50,9 @@ def save(cookie_jar, log_output=True): log_cookie(cookie_jar) cookie_file = xbmcvfs.File(cookie_file_path(), 'wb') try: - # Requests RequestsCookieJar it's a dict, for compatibility we convert it to the generic http.cookiejar + # For compatibility, we convert CookieJar object to our PickleableCookieJar # to keep possibility to change in future Requests module with another one - jar = cookiejar_from_dict(cookie_jar) - cookie_file.write(bytearray(pickle.dumps(PickleableCookieJar.cast(jar)))) + cookie_file.write(bytearray(pickle.dumps(PickleableCookieJar.cast(cookie_jar)))) except Exception as exc: # pylint: disable=broad-except LOG.error('Failed to save cookies to file: {exc}', exc=exc) finally: @@ -84,12 +83,7 @@ def load(): # cookie_jar.clear(cookie.domain, cookie.path, cookie.name) LOG.debug('Cookies loaded from file') log_cookie(cookie_jar) - # Convert the generic http.cookiejar in to RequestsCookieJar of Request module - from requests.cookies import RequestsCookieJar - req_cookie_jar = RequestsCookieJar() - req_cookie_jar.update(cookie_jar) - - return req_cookie_jar + return cookie_jar except Exception as exc: # pylint: disable=broad-except import traceback LOG.error('Failed to load cookies from file: {exc}', exc=exc)