diff options
| author | Sergey M․ <[email protected]> | 2018-01-23 22:23:12 +0700 |
|---|---|---|
| committer | Sergey M․ <[email protected]> | 2018-01-23 22:23:12 +0700 |
| commit | cf2820710d61742818a906af07f6d6c9669d58a9 (patch) | |
| tree | 49da7e89124bcbfd9d297906d8436ff1cd107820 /youtube_dl/extractor/adn.py | |
| parent | 5d7d805ca90992cac1cdffbe5d3df3d894d2b979 (diff) | |
| download | youtube-dl-cf2820710d61742818a906af07f6d6c9669d58a9.tar.gz youtube-dl-cf2820710d61742818a906af07f6d6c9669d58a9.zip | |
Switch codebase to use compat_b64decode
Diffstat (limited to 'youtube_dl/extractor/adn.py')
| -rw-r--r-- | youtube_dl/extractor/adn.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/adn.py b/youtube_dl/extractor/adn.py index cffdab6ca..64fb755da 100644 --- a/youtube_dl/extractor/adn.py +++ b/youtube_dl/extractor/adn.py @@ -1,13 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals -import base64 import json import os from .common import InfoExtractor from ..aes import aes_cbc_decrypt -from ..compat import compat_ord +from ..compat import ( + compat_b64decode, + compat_ord, +) from ..utils import ( bytes_to_intlist, ExtractorError, @@ -48,9 +50,9 @@ class ADNIE(InfoExtractor): # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js dec_subtitles = intlist_to_bytes(aes_cbc_decrypt( - bytes_to_intlist(base64.b64decode(enc_subtitles[24:])), + bytes_to_intlist(compat_b64decode(enc_subtitles[24:])), bytes_to_intlist(b'\x1b\xe0\x29\x61\x38\x94\x24\x00\x12\xbd\xc5\x80\xac\xce\xbe\xb0'), - bytes_to_intlist(base64.b64decode(enc_subtitles[:24])) + bytes_to_intlist(compat_b64decode(enc_subtitles[:24])) )) subtitles_json = self._parse_json( dec_subtitles[:-compat_ord(dec_subtitles[-1])].decode(), |