New upstream version 2017.03.26

[youtubedl] / youtube_dl / extractor / drbonanza.py

diff --git a/youtube_dl/extractor/drbonanza.py b/youtube_dl/extractor/drbonanza.py
index 8b98b013adeee32c67c769acfb88d76edff9a1f7..79ec212c890471bd72a0e88eaf7bec0da70af124 100644 (file)
--- a/youtube_dl/extractor/drbonanza.py
+++ b/youtube_dl/extractor/drbonanza.py
@@ -20,7 +20,7 @@ class DRBonanzaIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Talkshowet - Leonard Cohen',
             'description': 'md5:8f34194fb30cd8c8a30ad8b27b70c0ca',
             'ext': 'mp4',
             'title': 'Talkshowet - Leonard Cohen',
             'description': 'md5:8f34194fb30cd8c8a30ad8b27b70c0ca',

-            'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+            'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',

             'timestamp': 1295537932,
             'upload_date': '20110120',
             'duration': 3664,
             'timestamp': 1295537932,
             'upload_date': '20110120',
             'duration': 3664,


@@ -36,7 +36,7 @@ class DRBonanzaIE(InfoExtractor):
             'ext': 'mp3',
             'title': 'EM fodbold 1992 Danmark - Tyskland finale Transmission',
             'description': 'md5:501e5a195749480552e214fbbed16c4e',
             'ext': 'mp3',
             'title': 'EM fodbold 1992 Danmark - Tyskland finale Transmission',
             'description': 'md5:501e5a195749480552e214fbbed16c4e',

-            'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+            'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',

             'timestamp': 1223274900,
             'upload_date': '20081006',
             'duration': 7369,
             'timestamp': 1223274900,
             'upload_date': '20081006',
             'duration': 7369,


@@ -87,7 +87,7 @@ class DRBonanzaIE(InfoExtractor):
 
         formats = []
         for file in info['Files']:
 
         formats = []
         for file in info['Files']:

-            if info['Type'] == "Video":
+            if info['Type'] == 'Video':

                 if file['Type'] in video_types:
                     format = parse_filename_info(file['Location'])
                     format.update({
                 if file['Type'] in video_types:
                     format = parse_filename_info(file['Location'])
                     format.update({


@@ -101,10 +101,10 @@ class DRBonanzaIE(InfoExtractor):
                         if '/bonanza/' in rtmp_url:
                             format['play_path'] = rtmp_url.split('/bonanza/')[1]
                     formats.append(format)
                         if '/bonanza/' in rtmp_url:
                             format['play_path'] = rtmp_url.split('/bonanza/')[1]
                     formats.append(format)

-                elif file['Type'] == "Thumb":
+                elif file['Type'] == 'Thumb':

                     thumbnail = file['Location']
                     thumbnail = file['Location']

-            elif info['Type'] == "Audio":
-                if file['Type'] == "Audio":
+            elif info['Type'] == 'Audio':
+                if file['Type'] == 'Audio':

                     format = parse_filename_info(file['Location'])
                     format.update({
                         'url': file['Location'],
                     format = parse_filename_info(file['Location'])
                     format.update({
                         'url': file['Location'],


@@ -112,7 +112,7 @@ class DRBonanzaIE(InfoExtractor):
                         'vcodec': 'none',
                     })
                     formats.append(format)
                         'vcodec': 'none',
                     })
                     formats.append(format)

-                elif file['Type'] == "Thumb":
+                elif file['Type'] == 'Thumb':

                     thumbnail = file['Location']
 
         description = '%s\n%s\n%s\n' % (
                     thumbnail = file['Location']
 
         description = '%s\n%s\n%s\n' % (