X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fmtv.py;h=e96d3952cc79ebe8294302d9795672b7a574590e;hb=cf519235455f312ac45e1d9829018eb5ecbec628;hp=001a576a8710fb45a7c3e4d4dfc9f634af39dc87;hpb=f13d09332d320d514d508eaf8f2b889fa570816b;p=youtube-dl.git

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 001a576a8..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,
@@ -87,7 +89,7 @@ class MTVIE(InfoExtractor):
 
         description_node = itemdoc.find('description')
         if description_node is not None:
-            description = description_node.text
+            description = description_node.text.strip()
         else:
             description = None