New upstream version 2019.09.01

[youtubedl] / youtube_dl / extractor / iqiyi.py

diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py
index fdfa7de9ef05ce5b509f786d99027c6b5deb0bdf..cd11aa70f01ea7f1f258be9d9a76eeba1381d525 100644 (file)
--- a/youtube_dl/extractor/iqiyi.py
+++ b/youtube_dl/extractor/iqiyi.py
@@ -239,7 +239,7 @@ class IqiyiIE(InfoExtractor):
         return ohdave_rsa_encrypt(data, e, N)
 
     def _login(self):
         return ohdave_rsa_encrypt(data, e, N)
 
     def _login(self):

-        (username, password) = self._get_login_info()
+        username, password = self._get_login_info()

 
         # No authentication to be performed
         if not username:
 
         # No authentication to be performed
         if not username:


@@ -383,9 +383,9 @@ class IqiyiIE(InfoExtractor):
             self._sleep(5, video_id)
 
         self._sort_formats(formats)
             self._sleep(5, video_id)
 
         self._sort_formats(formats)

-        title = (get_element_by_id('widget-videotitle', webpage) or
-                 clean_html(get_element_by_attribute('class', 'mod-play-tit', webpage)) or
-                 self._html_search_regex(r'<span[^>]+data-videochanged-title="word"[^>]*>([^<]+)</span>', webpage, 'title'))
+        title = (get_element_by_id('widget-videotitle', webpage)
+                 or clean_html(get_element_by_attribute('class', 'mod-play-tit', webpage))
+                 or self._html_search_regex(r'<span[^>]+data-videochanged-title="word"[^>]*>([^<]+)</span>', webpage, 'title'))

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,