Merge pull request #9110 from remitamine/parse_duration

[youtube-dl] / youtube_dl / extractor / brightcove.py

diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py
index 6128b676276d144113aef0aa015fd3ffafde771b..f0781fc273a18ec30c1ffa97546232d991ad8574 100644 (file)
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dl/extractor/brightcove.py
@@ -48,7 +48,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                 'description': 'md5:a950cc4285c43e44d763d036710cd9cd',
                 'timestamp': 1368213670,
                 'upload_date': '20130510',
-                'uploader_id': 1589608506001,
+                'uploader_id': '1589608506001',
             }
         },
         {
@@ -62,7 +62,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                 'uploader': 'Oracle',
                 'timestamp': 1344975024,
                 'upload_date': '20120814',
-                'uploader_id': 1460825906,
+                'uploader_id': '1460825906',
             },
         },
         {
@@ -76,7 +76,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                 'uploader': 'Mashable',
                 'timestamp': 1382041798,
                 'upload_date': '20131017',
-                'uploader_id': 1130468786001,
+                'uploader_id': '1130468786001',
             },
         },
         {
@@ -104,7 +104,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                 'description': 'UCI MTB World Cup 2014: Fort William, UK - Downhill Finals',
                 'timestamp': 1409122195,
                 'upload_date': '20140827',
-                'uploader_id': 710858724001,
+                'uploader_id': '710858724001',
             },
         },
         {
@@ -307,13 +307,14 @@ class BrightcoveLegacyIE(InfoExtractor):
                                     playlist_title=playlist_info['mediaCollectionDTO']['displayName'])
 
     def _extract_video_info(self, video_info):
+        publisher_id = video_info.get('publisherId')
         info = {
             'id': compat_str(video_info['id']),
             'title': video_info['displayName'].strip(),
             'description': video_info.get('shortDescription'),
             'thumbnail': video_info.get('videoStillURL') or video_info.get('thumbnailURL'),
             'uploader': video_info.get('publisherName'),
-            'uploader_id': video_info.get('publisherId'),
+            'uploader_id': compat_str(publisher_id) if publisher_id else None,
             'duration': float_or_none(video_info.get('length'), 1000),
             'timestamp': int_or_none(video_info.get('creationDate'), 1000),
         }
@@ -339,7 +340,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                         ext = 'flv'
                 if ext is None:
                     ext = determine_ext(url)
-                tbr = int_or_none(rend.get('encodingRate'), 1000),
+                tbr = int_or_none(rend.get('encodingRate'), 1000)
                 a_format = {
                     'format_id': 'http%s' % ('-%s' % tbr if tbr else ''),
                     'url': url,