aboutsummaryrefslogtreecommitdiffstats
path: root/yt_dlp/extractor/adn.py
diff options
context:
space:
mode:
authorcoletdjnz <coletdjnz@protonmail.com>2023-07-09 13:23:02 +0530
committerpukkandan <pukkandan.ytdlp@gmail.com>2023-07-15 16:18:35 +0530
commit3d2623a898196640f7cc0fc8b70118ff19e6925d (patch)
treea0dc9fe53959ca673294902f7a553f55706cc5f3 /yt_dlp/extractor/adn.py
parent227bf1a33be7b89cd7d44ad046844c4ccba104f4 (diff)
downloadhypervideo-pre-3d2623a898196640f7cc0fc8b70118ff19e6925d.tar.lz
hypervideo-pre-3d2623a898196640f7cc0fc8b70118ff19e6925d.tar.xz
hypervideo-pre-3d2623a898196640f7cc0fc8b70118ff19e6925d.zip
[compat, networking] Deprecate old functions (#2861)
Authored by: coletdjnz, pukkandan
Diffstat (limited to 'yt_dlp/extractor/adn.py')
-rw-r--r--yt_dlp/extractor/adn.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/yt_dlp/extractor/adn.py b/yt_dlp/extractor/adn.py
index f1f55e87f..b59dbc850 100644
--- a/yt_dlp/extractor/adn.py
+++ b/yt_dlp/extractor/adn.py
@@ -6,10 +6,8 @@ import random
from .common import InfoExtractor
from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
-from ..compat import (
- compat_HTTPError,
- compat_b64decode,
-)
+from ..compat import compat_b64decode
+from ..networking.exceptions import HTTPError
from ..utils import (
ass_subtitles_timecode,
bytes_to_intlist,
@@ -142,9 +140,9 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
self._HEADERS = {'authorization': 'Bearer ' + access_token}
except ExtractorError as e:
message = None
- if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
+ if isinstance(e.cause, HTTPError) and e.cause.status == 401:
resp = self._parse_json(
- e.cause.read().decode(), None, fatal=False) or {}
+ e.cause.response.read().decode(), None, fatal=False) or {}
message = resp.get('message') or resp.get('code')
self.report_warning(message or self._LOGIN_ERR_MESSAGE)
@@ -195,14 +193,14 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
})
break
except ExtractorError as e:
- if not isinstance(e.cause, compat_HTTPError):
+ if not isinstance(e.cause, HTTPError):
raise e
- if e.cause.code == 401:
+ if e.cause.status == 401:
# This usually goes away with a different random pkcs1pad, so retry
continue
- error = self._parse_json(e.cause.read(), video_id)
+ error = self._parse_json(e.cause.response.read(), video_id)
message = error.get('message')
if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country':
self.raise_geo_restricted(msg=message)