[gametrailers] Fix gametrailers test
authorSergey M. <dstftw@gmail.com>
Tue, 11 Feb 2014 18:50:53 +0000 (01:50 +0700)
committerSergey M. <dstftw@gmail.com>
Tue, 11 Feb 2014 18:50:53 +0000 (01:50 +0700)
youtube_dl/extractor/gametrailers.py
youtube_dl/extractor/mtv.py

index 66b3b50d46b4224b4f79dedbd98aad8d8e19bcac..a6ab795aef1bab4a56b2655515983aed35886a77 100644 (file)
@@ -7,10 +7,11 @@ class GametrailersIE(MTVServicesInfoExtractor):
     _VALID_URL = r'http://www\.gametrailers\.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
     _TEST = {
         'url': 'http://www.gametrailers.com/videos/zbvr8i/mirror-s-edge-2-e3-2013--debut-trailer',
-        'file': '70e9a5d7-cf25-4a10-9104-6f3e7342ae0d.mp4',
         'md5': '4c8e67681a0ea7ec241e8c09b3ea8cf7',
         'info_dict': {
-            'title': 'Mirror\'s Edge 2|E3 2013: Debut Trailer',
+            'id': '70e9a5d7-cf25-4a10-9104-6f3e7342ae0d',
+            'ext': 'mp4',
+            'title': 'E3 2013: Debut Trailer',
             'description': 'Faith is back!  Check out the World Premiere trailer for Mirror\'s Edge 2 straight from the EA Press Conference at E3 2013!',
         },
     }
index 4f9308436280c82c8e2f011bf0411c79cfdcc517..5447b6c0cab098b895eda0e9f2b3b266fb65a7b0 100644 (file)
@@ -85,11 +85,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
         if title_el is None:
             title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title')
         if title_el is None:
-            title_el = itemdoc.find('./title')
+            title_el = itemdoc.find('.//title')
             if title_el.text is None:
                 title_el = None
-        if title_el is None:
-            title_el = itemdoc.find('./item/title')
 
         title = title_el.text
         if title is None: