diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-29 06:48:18 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-29 06:48:18 +0100 |
| commit | f7ff55aa7876ba8a58bbee002d254aa6ab49302b (patch) | |
| tree | 81e15b5aa67c1bd3f16eda455958889cc65ceca9 /youtube_dl/extractor | |
| parent | 795f28f871074aca2a74dfe67e1e75252b525c4c (diff) | |
| parent | f6cc16f5d821a50df173b865164e4fa9cbe854af (diff) | |
| download | youtube-dl-f7ff55aa7876ba8a58bbee002d254aa6ab49302b.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/mtv.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py index e520e2bb4..e96d3952c 100644 --- a/youtube_dl/extractor/mtv.py +++ b/youtube_dl/extractor/mtv.py @@ -80,6 +80,8 @@ class MTVIE(InfoExtractor): video_id = self._id_from_uri(uri) self.report_extraction(video_id) mediagen_url = itemdoc.find('%s/%s' % (_media_xml_tag('group'), _media_xml_tag('content'))).attrib['url'] + # Remove the templates, like &device={device} + mediagen_url = re.sub(r'&[^=]*?={.*?}(?=(&|$))', u'', mediagen_url) if 'acceptMethods' not in mediagen_url: mediagen_url += '&acceptMethods=fms' mediagen_page = self._download_webpage(mediagen_url, video_id, |