소스 검색

[sohu] Fix test's note info

Sergey M․ 10 년 전
부모
커밋
cd459b1d49
1개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 5
      youtube_dl/extractor/sohu.py

+ 6 - 5
youtube_dl/extractor/sohu.py

@@ -8,7 +8,7 @@ from ..compat import (
     compat_str,
     compat_str,
     compat_urllib_request
     compat_urllib_request
 )
 )
-from ..utils import url_sanitize_consecutive_slashes
+from ..utils import sanitize_url_path_consecutive_slashes
 
 
 
 
 class SohuIE(InfoExtractor):
 class SohuIE(InfoExtractor):
@@ -74,7 +74,7 @@ class SohuIE(InfoExtractor):
             }
             }
         }]
         }]
     }, {
     }, {
-        'info': 'Video with title containing dash',
+        'note': 'Video with title containing dash',
         'url': 'http://my.tv.sohu.com/us/249884221/78932792.shtml',
         'url': 'http://my.tv.sohu.com/us/249884221/78932792.shtml',
         'info_dict': {
         'info_dict': {
             'id': '78932792',
             'id': '78932792',
@@ -100,8 +100,9 @@ class SohuIE(InfoExtractor):
             if cn_verification_proxy:
             if cn_verification_proxy:
                 req.add_header('Ytdl-request-proxy', cn_verification_proxy)
                 req.add_header('Ytdl-request-proxy', cn_verification_proxy)
 
 
-            return self._download_json(req, video_id,
-                                       'Downloading JSON data for %s' % vid_id)
+            return self._download_json(
+                req, video_id,
+                'Downloading JSON data for %s' % vid_id)
 
 
         mobj = re.match(self._VALID_URL, url)
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
         video_id = mobj.group('id')
@@ -146,7 +147,7 @@ class SohuIE(InfoExtractor):
 
 
                 part_info = part_str.split('|')
                 part_info = part_str.split('|')
 
 
-                video_url = url_sanitize_consecutive_slashes(
+                video_url = sanitize_url_path_consecutive_slashes(
                     '%s%s?key=%s' % (part_info[0], su[i], part_info[3]))
                     '%s%s?key=%s' % (part_info[0], su[i], part_info[3]))
 
 
                 formats.append({
                 formats.append({