Imported Debian patch 2015.11.27.1-1.1

[youtubedl] / youtube_dl / extractor / videott.py

diff --git a/youtube_dl/extractor/videott.py b/youtube_dl/extractor/videott.py
index 1f938838cc9247e9e80c8ce32911cb40954c1830..591024eaded0cdddbb0779bd942c0fa8f63d86a6 100644 (file)
--- a/youtube_dl/extractor/videott.py
+++ b/youtube_dl/extractor/videott.py
@@ -13,9 +13,9 @@ from ..utils import (
 class VideoTtIE(InfoExtractor):
     ID_NAME = 'video.tt'
     IE_DESC = 'video.tt - Your True Tube'
 class VideoTtIE(InfoExtractor):
     ID_NAME = 'video.tt'
     IE_DESC = 'video.tt - Your True Tube'

-    _VALID_URL = r'http://(?:www\.)?video\.tt/(?:video/|watch_video\.php\?v=)(?P<id>[\da-zA-Z]{9})'
+    _VALID_URL = r'http://(?:www\.)?video\.tt/(?:(?:video|embed)/|watch_video\.php\?v=)(?P<id>[\da-zA-Z]{9})'

 
 

-    _TEST = {
+    _TESTS = [{

         'url': 'http://www.video.tt/watch_video.php?v=amd5YujV8',
         'md5': 'b13aa9e2f267effb5d1094443dff65ba',
         'info_dict': {
         'url': 'http://www.video.tt/watch_video.php?v=amd5YujV8',
         'md5': 'b13aa9e2f267effb5d1094443dff65ba',
         'info_dict': {


@@ -26,7 +26,10 @@ class VideoTtIE(InfoExtractor):
             'upload_date': '20130827',
             'uploader': 'joseph313',
         }
             'upload_date': '20130827',
             'uploader': 'joseph313',
         }

-    }
+    }, {
+        'url': 'http://video.tt/embed/amd5YujV8',
+        'only_matching': True,
+    }]

 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)


@@ -40,7 +43,7 @@ class VideoTtIE(InfoExtractor):
 
         formats = [
             {
 
         formats = [
             {

-                'url': base64.b64decode(res['u']).decode('utf-8'),
+                'url': base64.b64decode(res['u'].encode('utf-8')).decode('utf-8'),

                 'ext': 'flv',
                 'format_id': res['l'],
             } for res in settings['res'] if res['u']
                 'ext': 'flv',
                 'format_id': res['l'],
             } for res in settings['res'] if res['u']