aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-22 00:03:46 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-22 00:18:52 +0100
commit06769acd717191ed61ce639314975816a8f7969c (patch)
treeefaca5828575fdffa62ed09251d9a60e62c12496
parent32dac6943d7e00203bb11695016178c3a23fb135 (diff)
downloadyoutube-dl-06769acd717191ed61ce639314975816a8f7969c.tar.xz
[gametrailers] Use unicode_literals
Conflicts: youtube_dl/extractor/gametrailers.py
-rw-r--r--youtube_dl/extractor/gametrailers.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/youtube_dl/extractor/gametrailers.py b/youtube_dl/extractor/gametrailers.py
index 617578e72..c1fdd770e 100644
--- a/youtube_dl/extractor/gametrailers.py
+++ b/youtube_dl/extractor/gametrailers.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import re
from .mtv import MTVServicesInfoExtractor
@@ -6,12 +8,12 @@ from .mtv import MTVServicesInfoExtractor
class GametrailersIE(MTVServicesInfoExtractor):
_VALID_URL = r'http://www\.gametrailers\.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
_TEST = {
- u'url': u'http://www.gametrailers.com/videos/zbvr8i/mirror-s-edge-2-e3-2013--debut-trailer',
- u'file': u'70e9a5d7-cf25-4a10-9104-6f3e7342ae0d.mp4',
- u'md5': u'4c8e67681a0ea7ec241e8c09b3ea8cf7',
- u'info_dict': {
- u'title': u'Mirror\'s Edge 2|E3 2013: Debut Trailer',
- u'description': u'Faith is back! Check out the World Premiere trailer for Mirror\'s Edge 2 straight from the EA Press Conference at E3 2013!',
+ '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',
+ 'description': 'Faith is back! Check out the World Premiere trailer for Mirror\'s Edge 2 straight from the EA Press Conference at E3 2013!',
},
}
@@ -23,5 +25,5 @@ class GametrailersIE(MTVServicesInfoExtractor):
webpage = self._download_webpage(url, video_id)
mgid = self._search_regex([r'data-video="(?P<mgid>mgid:.*?)"',
r'data-contentId=\'(?P<mgid>mgid:.*?)\''],
- webpage, u'mgid')
+ webpage, 'mgid')
return self._get_videos_info(mgid)