Merge branch 'baidu' of https://github.com/remitamine/youtube-dl into remitamine...

[youtube-dl] / youtube_dl / extractor / dramafever.py

diff --git a/youtube_dl/extractor/dramafever.py b/youtube_dl/extractor/dramafever.py
index 80a928827c4ef768eaa89bd2ac86e22823e9e43d..b3b21d65f4c164b5a0e679e6bf6b1dfa33bcb80b 100644 (file)
--- a/youtube_dl/extractor/dramafever.py
+++ b/youtube_dl/extractor/dramafever.py
@@ -7,15 +7,12 @@ from .amp import AMPIE
 from ..compat import (
     compat_HTTPError,
     compat_urllib_parse,
-    compat_urllib_request,
     compat_urlparse,
 )
 from ..utils import (
     ExtractorError,
     clean_html,
-    determine_ext,
-    int_or_none,
-    parse_iso8601,
+    sanitized_Request,
 )
 
 
@@ -51,7 +48,7 @@ class DramaFeverBaseIE(AMPIE):
             'password': password,
         }
 
-        request = compat_urllib_request.Request(
+        request = sanitized_Request(
             self._LOGIN_URL, compat_urllib_parse.urlencode(login_form).encode('utf-8'))
         response = self._download_webpage(
             request, None, 'Logging in as %s' % username)
@@ -91,7 +88,8 @@ class DramaFeverIE(DramaFeverBaseIE):
         video_id = self._match_id(url).replace('/', '.')
 
         try:
-            info = self._extract_feed_info('http://www.dramafever.com/amp/episode/feed.json?guid=%s' % video_id)
+            info = self._extract_feed_info(
+                'http://www.dramafever.com/amp/episode/feed.json?guid=%s' % video_id)
         except ExtractorError as e:
             if isinstance(e.cause, compat_HTTPError):
                 raise ExtractorError(
@@ -110,7 +108,7 @@ class DramaFeverIE(DramaFeverBaseIE):
             if value:
                 subfile = value[0].get('subfile') or value[0].get('new_subfile')
                 if subfile and subfile != 'http://www.dramafever.com/st/':
-                    info['subtitiles'].setdefault('English', []).append({
+                    info.setdefault('subtitles', {}).setdefault('English', []).append({
                         'ext': 'srt',
                         'url': subfile,
                     })