X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fsohu.py;h=11edf616ac8a781f0765cec94a7e49b2cb07c32c;hb=372f08c99057b6a994c72cf2591e184231b3e850;hp=ea5cc06b980771fb4c9ab29459846084269c75a2;hpb=dc03a42537cba83597ca8acb2bbe03f686f2136c;p=youtube-dl diff --git a/youtube_dl/extractor/sohu.py b/youtube_dl/extractor/sohu.py index ea5cc06b9..11edf616a 100644 --- a/youtube_dl/extractor/sohu.py +++ b/youtube_dl/extractor/sohu.py @@ -8,7 +8,7 @@ from ..compat import ( compat_str, compat_urllib_request ) -from ..utils import url_sanitize_consecutive_slashes +from ..utils import sanitize_url_path_consecutive_slashes 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', 'info_dict': { 'id': '78932792', @@ -100,8 +100,9 @@ class SohuIE(InfoExtractor): if 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) video_id = mobj.group('id') @@ -146,7 +147,7 @@ class SohuIE(InfoExtractor): 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])) formats.append({