Merge remote-tracking branch 'dstftw/generic-webpage-unescape'

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

diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py
index 8f4db59d42dc4fc8268295e6a22f3470d47be9c3..ee47c30bab9bd37a5d8e75109f29108864db68d0 100644 (file)
--- a/youtube_dl/extractor/vevo.py
+++ b/youtube_dl/extractor/vevo.py
@@ -21,6 +21,7 @@ class VevoIE(InfoExtractor):
            https?://videoplayer\.vevo\.com/embed/embedded\?videoId=|
            vevo:)
         (?P<id>[^&?#]+)'''
+
     _TESTS = [{
         'url': 'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280',
         "md5": "06bea460acb744eab74a9d7dcb4bfd61",
@@ -33,7 +34,8 @@ class VevoIE(InfoExtractor):
             "duration": 230.12,
             "width": 1920,
             "height": 1080,
-            'timestamp': 1372057200,
+            # timestamp and upload_date are often incorrect; seem to change randomly
+            'timestamp': int,
         }
     }, {
         'note': 'v3 SMIL format',
@@ -47,7 +49,7 @@ class VevoIE(InfoExtractor):
             'title': 'I Wish I Could Break Your Heart',
             'duration': 226.101,
             'age_limit': 0,
-            'timestamp': 1392796919,
+            'timestamp': int,
         }
     }, {
         'note': 'Age-limited video',
@@ -58,8 +60,8 @@ class VevoIE(InfoExtractor):
             'age_limit': 18,
             'title': 'Tunnel Vision (Explicit)',
             'uploader': 'Justin Timberlake',
-            'upload_date': '20130704',
-            'timestamp': 1372906800,
+            'upload_date': 're:2013070[34]',
+            'timestamp': int,
         },
         'params': {
             'skip_download': 'true',