瀏覽代碼

[myvideo] Use compat_urllib_parse_unquote

Sergey M․ 10 年之前
父節點
當前提交
9fd3bf04b7
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      youtube_dl/extractor/myvideo.py

+ 6 - 5
youtube_dl/extractor/myvideo.py

@@ -10,6 +10,7 @@ from .common import InfoExtractor
 from ..compat import (
 from ..compat import (
     compat_ord,
     compat_ord,
     compat_urllib_parse,
     compat_urllib_parse,
+    compat_urllib_parse_unquote,
     compat_urllib_request,
     compat_urllib_request,
 )
 )
 from ..utils import (
 from ..utils import (
@@ -107,7 +108,7 @@ class MyVideoIE(InfoExtractor):
             if not a == '_encxml':
             if not a == '_encxml':
                 params[a] = b
                 params[a] = b
             else:
             else:
-                encxml = compat_urllib_parse.unquote(b)
+                encxml = compat_urllib_parse_unquote(b)
         if not params.get('domain'):
         if not params.get('domain'):
             params['domain'] = 'www.myvideo.de'
             params['domain'] = 'www.myvideo.de'
         xmldata_url = '%s?%s' % (encxml, compat_urllib_parse.urlencode(params))
         xmldata_url = '%s?%s' % (encxml, compat_urllib_parse.urlencode(params))
@@ -135,7 +136,7 @@ class MyVideoIE(InfoExtractor):
         video_url = None
         video_url = None
         mobj = re.search('connectionurl=\'(.*?)\'', dec_data)
         mobj = re.search('connectionurl=\'(.*?)\'', dec_data)
         if mobj:
         if mobj:
-            video_url = compat_urllib_parse.unquote(mobj.group(1))
+            video_url = compat_urllib_parse_unquote(mobj.group(1))
             if 'myvideo2flash' in video_url:
             if 'myvideo2flash' in video_url:
                 self.report_warning(
                 self.report_warning(
                     'Rewriting URL to use unencrypted rtmp:// ...',
                     'Rewriting URL to use unencrypted rtmp:// ...',
@@ -147,10 +148,10 @@ class MyVideoIE(InfoExtractor):
             mobj = re.search('path=\'(http.*?)\' source=\'(.*?)\'', dec_data)
             mobj = re.search('path=\'(http.*?)\' source=\'(.*?)\'', dec_data)
             if mobj is None:
             if mobj is None:
                 raise ExtractorError('unable to extract url')
                 raise ExtractorError('unable to extract url')
-            video_url = compat_urllib_parse.unquote(mobj.group(1)) + compat_urllib_parse.unquote(mobj.group(2))
+            video_url = compat_urllib_parse_unquote(mobj.group(1)) + compat_urllib_parse_unquote(mobj.group(2))
 
 
         video_file = self._search_regex('source=\'(.*?)\'', dec_data, 'video file')
         video_file = self._search_regex('source=\'(.*?)\'', dec_data, 'video file')
-        video_file = compat_urllib_parse.unquote(video_file)
+        video_file = compat_urllib_parse_unquote(video_file)
 
 
         if not video_file.endswith('f4m'):
         if not video_file.endswith('f4m'):
             ppath, prefix = video_file.split('.')
             ppath, prefix = video_file.split('.')
@@ -159,7 +160,7 @@ class MyVideoIE(InfoExtractor):
             video_playpath = ''
             video_playpath = ''
 
 
         video_swfobj = self._search_regex('swfobject.embedSWF\(\'(.+?)\'', webpage, 'swfobj')
         video_swfobj = self._search_regex('swfobject.embedSWF\(\'(.+?)\'', webpage, 'swfobj')
-        video_swfobj = compat_urllib_parse.unquote(video_swfobj)
+        video_swfobj = compat_urllib_parse_unquote(video_swfobj)
 
 
         video_title = self._html_search_regex("<h1(?: class='globalHd')?>(.*?)</h1>",
         video_title = self._html_search_regex("<h1(?: class='globalHd')?>(.*?)</h1>",
                                               webpage, 'title')
                                               webpage, 'title')