]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[crunchyroll] limit VRVIE inheritance to CrunchyrollIE
authorRemita Amine <remitamine@gmail.com>
Sat, 1 Sep 2018 09:04:10 +0000 (10:04 +0100)
committerRemita Amine <remitamine@gmail.com>
Sat, 1 Sep 2018 09:04:10 +0000 (10:04 +0100)
youtube_dl/extractor/crunchyroll.py

index 4ed45837236c64dd317d2ce2a5fe0e78b52e95a3..ba8b9fa7eff3105fb657cf322fdacab17da632eb 100644 (file)
@@ -7,6 +7,7 @@ import zlib
 
 from hashlib import sha1
 from math import pow, sqrt, floor
+from .common import InfoExtractor
 from .vrv import VRVIE
 from ..compat import (
     compat_b64decode,
@@ -34,7 +35,7 @@ from ..aes import (
 )
 
 
-class CrunchyrollBaseIE(VRVIE):
+class CrunchyrollBaseIE(InfoExtractor):
     _LOGIN_URL = 'https://www.crunchyroll.com/login'
     _LOGIN_FORM = 'login_form'
     _NETRC_MACHINE = 'crunchyroll'
@@ -140,7 +141,8 @@ class CrunchyrollBaseIE(VRVIE):
             parsed_url._replace(query=compat_urllib_parse_urlencode(qs, True)))
 
 
-class CrunchyrollIE(CrunchyrollBaseIE):
+class CrunchyrollIE(CrunchyrollBaseIE, VRVIE):
+    IE_NAME = 'crunchyroll'
     _VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.(?:com|fr)/(?:media(?:-|/\?id=)|[^/]*/[^/?&]*?)(?P<video_id>[0-9]+))(?:[/?&]|$)'
     _TESTS = [{
         'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513',