Merge tag 'upstream/2015.07.21'

[youtubedl] / youtube_dl / extractor / appletrailers.py

diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py
index 287f71e076e91a44ea331c995410fbe8b40d178d..576f03b5b71115771555e1d8d46f4a108eb9de93 100644 (file)
--- a/youtube_dl/extractor/appletrailers.py
+++ b/youtube_dl/extractor/appletrailers.py
@@ -11,9 +11,12 @@ from ..utils import (
 
 
 class AppleTrailersIE(InfoExtractor):
 
 
 class AppleTrailersIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?trailers\.apple\.com/trailers/(?P<company>[^/]+)/(?P<movie>[^/]+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:www\.)?trailers\.apple\.com/(?:trailers|ca)/(?P<company>[^/]+)/(?P<movie>[^/]+)'
+    _TESTS = [{

         "url": "http://trailers.apple.com/trailers/wb/manofsteel/",
         "url": "http://trailers.apple.com/trailers/wb/manofsteel/",

+        'info_dict': {
+            'id': 'manofsteel',
+        },

         "playlist": [
             {
                 "md5": "d97a8e575432dbcb81b7c3acb741f8a8",
         "playlist": [
             {
                 "md5": "d97a8e575432dbcb81b7c3acb741f8a8",


@@ -60,7 +63,10 @@ class AppleTrailersIE(InfoExtractor):
                 },
             },
         ]
                 },
             },
         ]

-    }
+    }, {
+        'url': 'http://trailers.apple.com/ca/metropole/autrui/',
+        'only_matching': True,
+    }]

 
     _JSON_RE = r'iTunes.playURL\((.*?)\);'
 
 
     _JSON_RE = r'iTunes.playURL\((.*?)\);'