[compat, networking] Deprecate old functions (#2861)
Authored by: coletdjnz, pukkandan
This commit is contained in:
parent
227bf1a33b
commit
3d2623a898
176 changed files with 706 additions and 728 deletions
|
|
@ -6,7 +6,7 @@ import time
|
|||
import uuid
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..compat import compat_HTTPError
|
||||
from ..networking.exceptions import HTTPError
|
||||
from ..utils import (
|
||||
ExtractorError,
|
||||
int_or_none,
|
||||
|
|
@ -123,12 +123,12 @@ class SonyLIVIE(InfoExtractor):
|
|||
'https://apiv2.sonyliv.com/AGL/%s/A/ENG/WEB/%s' % (version, path),
|
||||
video_id, headers=self._HEADERS)['resultObj']
|
||||
except ExtractorError as e:
|
||||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 406 and self._parse_json(
|
||||
e.cause.read().decode(), video_id)['message'] == 'Please subscribe to watch this content':
|
||||
if isinstance(e.cause, HTTPError) and e.cause.status == 406 and self._parse_json(
|
||||
e.cause.response.read().decode(), video_id)['message'] == 'Please subscribe to watch this content':
|
||||
self.raise_login_required(self._LOGIN_HINT, method=None)
|
||||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
|
||||
if isinstance(e.cause, HTTPError) and e.cause.status == 403:
|
||||
message = self._parse_json(
|
||||
e.cause.read().decode(), video_id)['message']
|
||||
e.cause.response.read().decode(), video_id)['message']
|
||||
if message == 'Geoblocked Country':
|
||||
self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
|
||||
raise ExtractorError(message)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue