[techtalks] Modernize

youtube_dl/extractor/techtalks.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import re
 
 from .common import InfoExtractor
@@ -11,24 +13,30 @@ class TechTalksIE(InfoExtractor):
     _VALID_URL = r'https?://techtalks\.tv/talks/[^/]*/(?P<id>\d+)/'
 
     _TEST = {
-        u'url': u'http://techtalks.tv/talks/learning-topic-models-going-beyond-svd/57758/',
+        'url': 'http://techtalks.tv/talks/learning-topic-models-going-beyond-svd/57758/',
-        u'playlist': [
+        'info_dict': {
+            'id': '57758',
+            'title': 'Learning Topic Models --- Going beyond SVD',
+        },
+        'playlist': [
             {
-                u'file': u'57758.flv',
+                'info_dict': {
-                u'info_dict': {
+                    'id': '57758',
-                    u'title': u'Learning Topic Models --- Going beyond SVD',
+                    'ext': 'flv',
+                    'title': 'Learning Topic Models --- Going beyond SVD',
                 },
             },
             {
-                u'file': u'57758-slides.flv',
+                'info_dict': {
-                u'info_dict': {
+                    'id': '57758-slides',
-                    u'title': u'Learning Topic Models --- Going beyond SVD',
+                    'ext': 'flv',
+                    'title': 'Learning Topic Models --- Going beyond SVD',
                 },
             },
         ],
-        u'params': {
+        'params': {
             # rtmp download
-            u'skip_download': True,
+            'skip_download': True,
         },
     }
 
@@ -36,10 +44,11 @@ class TechTalksIE(InfoExtractor):
         mobj = re.match(self._VALID_URL, url)
         talk_id = mobj.group('id')
         webpage = self._download_webpage(url, talk_id)
-        rtmp_url = self._search_regex(r'netConnectionUrl: \'(.*?)\'', webpage,
+        rtmp_url = self._search_regex(
-            u'rtmp url')
+            r'netConnectionUrl: \'(.*?)\'', webpage, 'rtmp url')
-        play_path = self._search_regex(r'href=\'(.*?)\' [^>]*id="flowplayer_presenter"',
+        play_path = self._search_regex(
-            webpage, u'presenter play path')
+            r'href=\'(.*?)\' [^>]*id="flowplayer_presenter"',
+            webpage, 'presenter play path')
         title = clean_html(get_element_by_attribute('class', 'title', webpage))
         video_info = {
             'id': talk_id,
@@ -52,7 +61,11 @@ class TechTalksIE(InfoExtractor):
         if m_slides is None:
             return video_info
         else:
-            return [
+            return {
+                '_type': 'playlist',
+                'id': talk_id,
+                'title': title,
+                'entries': [
                     video_info,
                     # The slides video
                     {
@@ -62,4 +75,5 @@ class TechTalksIE(InfoExtractor):
                         'play_path': m_slides.group(1),
                         'ext': 'flv',
                     },
-            ]
+                ],
+            }