flake8 improvements

This commit is contained in:
bergoid 2023-11-04 22:17:35 +01:00
parent dd935aeda1
commit aef8a39bf3

View file

@ -1,6 +1,5 @@
import functools import functools
import json import json
from http.cookiejar import CookieJar
import urllib.parse import urllib.parse
import urllib.request import urllib.request
@ -25,6 +24,7 @@
urlencode_postdata, urlencode_postdata,
) )
def parse_year(timestamp): def parse_year(timestamp):
""" Return the first 4 characters as an int """ """ Return the first 4 characters as an int """
if isinstance(timestamp, str) and len(timestamp) >= 4: if isinstance(timestamp, str) and len(timestamp) >= 4:
@ -32,6 +32,7 @@ def parse_year(timestamp):
else: else:
return None return None
class VRTBaseIE(GigyaBaseIE): class VRTBaseIE(GigyaBaseIE):
_GEO_BYPASS = False _GEO_BYPASS = False
@ -106,7 +107,7 @@ def _call_api(self, video_id, client='null', id_token=None, version='v2'):
json_response = self._download_json( json_response = self._download_json(
f'https://media-services-public.vrt.be/vualto-video-aggregator-web/rest/external/{version}/tokens', f'https://media-services-public.vrt.be/vualto-video-aggregator-web/rest/external/{version}/tokens',
None, 'Downloading player token', 'Failed to download player token', headers={ 'Content-Type': 'application/json' }, data=json.dumps({ 'identityToken': id_token or self._get_cookies("https://www.vrt.be").get("vrtnu-site_profile_vt").value }).encode()) None, 'Downloading player token', 'Failed to download player token', headers={'Content-Type': 'application/json'}, data=json.dumps({'identityToken': id_token or self._get_cookies("https://www.vrt.be").get("vrtnu-site_profile_vt").value}).encode())
player_token = json_response['vrtPlayerToken'] player_token = json_response['vrtPlayerToken']
return self._download_json( return self._download_json(
@ -293,17 +294,17 @@ class VrtNUIE(VRTBaseIE):
def _perform_login(self, username, password): def _perform_login(self, username, password):
login_page = self._request_webpage('https://www.vrt.be/vrtnu/sso/login', None, note='Getting session cookies', errnote='Failed to get session cookies') self._request_webpage('https://www.vrt.be/vrtnu/sso/login', None, note='Getting session cookies', errnote='Failed to get session cookies')
res = self._download_json( self._download_json(
'https://login.vrt.be/perform_login', None, data=json.dumps({ 'https://login.vrt.be/perform_login', None, data=json.dumps({
"loginID": username, "loginID": username,
"password": password, "password": password,
"clientId": "vrtnu-site" "clientId": "vrtnu-site"
}).encode(), headers={ }).encode(), headers={
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Oidcxsrf': self._get_cookies('https://login.vrt.be').get('OIDCXSRF').value, 'Oidcxsrf': self._get_cookies('https://login.vrt.be').get('OIDCXSRF').value,
}, note='Logging in', errnote='Login failed') }, note='Logging in', errnote='Login failed')
self._authenticated = True self._authenticated = True
return return
@ -312,7 +313,7 @@ def _real_extract(self, url):
parsed_url = urllib.parse.urlparse(url) parsed_url = urllib.parse.urlparse(url)
# 1. Obtain/refresh 'vrtnu-site_profile' tokens # 1. Obtain/refresh 'vrtnu-site_profile' tokens
res = self._request_webpage('https://www.vrt.be/vrtnu/sso/login', None, note='Getting tokens', errnote='Failed to get tokens') self._request_webpage('https://www.vrt.be/vrtnu/sso/login', None, note='Getting tokens', errnote='Failed to get tokens')
# 2. Perform GraphQL query to obtain video metadata # 2. Perform GraphQL query to obtain video metadata
headers = { headers = {