Prepare to upload.

[youtubedl] / youtube_dl / extractor / tutv.py

diff --git a/youtube_dl/extractor/tutv.py b/youtube_dl/extractor/tutv.py
index d516b6427bd271fa8f7e1129cdbbcd9dda692ae1..362318b24b5df786cc98b9688d2859258e15178f 100644 (file)
--- a/youtube_dl/extractor/tutv.py
+++ b/youtube_dl/extractor/tutv.py
@@ -1,34 +1,33 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import base64
-import re
-

 from .common import InfoExtractor
 from .common import InfoExtractor

-from ..utils import compat_parse_qs
+from ..compat import (
+    compat_b64decode,
+    compat_parse_qs,
+)

 
 
 class TutvIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?tu\.tv/videos/(?P<id>[^/?]+)'
     _TEST = {
         'url': 'http://tu.tv/videos/robots-futbolistas',
 
 
 class TutvIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?tu\.tv/videos/(?P<id>[^/?]+)'
     _TEST = {
         'url': 'http://tu.tv/videos/robots-futbolistas',

-        'md5': '627c7c124ac2a9b5ab6addb94e0e65f7',
+        'md5': '0cd9e28ad270488911b0d2a72323395d',

         'info_dict': {
             'id': '2973058',
         'info_dict': {
             'id': '2973058',

-            'ext': 'flv',
+            'ext': 'mp4',

             'title': 'Robots futbolistas',
         },
     }
 
     def _real_extract(self, url):
             'title': 'Robots futbolistas',
         },
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
+        video_id = self._match_id(url)

         webpage = self._download_webpage(url, video_id)
         webpage = self._download_webpage(url, video_id)

+

         internal_id = self._search_regex(r'codVideo=([0-9]+)', webpage, 'internal video ID')
 
         data_content = self._download_webpage(
             'http://tu.tv/flvurl.php?codVideo=%s' % internal_id, video_id, 'Downloading video info')
         internal_id = self._search_regex(r'codVideo=([0-9]+)', webpage, 'internal video ID')
 
         data_content = self._download_webpage(
             'http://tu.tv/flvurl.php?codVideo=%s' % internal_id, video_id, 'Downloading video info')

-        video_url = base64.b64decode(compat_parse_qs(data_content)['kpt'][0]).decode('utf-8')
+        video_url = compat_b64decode(compat_parse_qs(data_content)['kpt'][0]).decode('utf-8')

 
         return {
             'id': internal_id,
 
         return {
             'id': internal_id,