aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2014-02-12 01:50:53 +0700
committerSergey M. <dstftw@gmail.com>2014-02-12 01:50:53 +0700
commit713d31fac83dcd1998e5dc322fa972cf00cb3b31 (patch)
treef73d3e9013b6af9441473561d544c7f345295e21
parent96cb10a5f56a5ba207f26887a52c9dc6257c2864 (diff)
[gametrailers] Fix gametrailers test
-rw-r--r--youtube_dl/extractor/gametrailers.py5
-rw-r--r--youtube_dl/extractor/mtv.py4
2 files changed, 4 insertions, 5 deletions
diff --git a/youtube_dl/extractor/gametrailers.py b/youtube_dl/extractor/gametrailers.py
index 66b3b50d4..a6ab795ae 100644
--- a/youtube_dl/extractor/gametrailers.py
+++ b/youtube_dl/extractor/gametrailers.py
@@ -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!',
},
}
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 4f9308436..5447b6c0c 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -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: