From: Pierre Rudloff Date: Thu, 22 Aug 2013 10:52:05 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=8d212e604a86da3c924ab15fe8045ab748a8183d;p=youtube-dl Merge remote-tracking branch 'upstream/master' Conflicts: youtube_dl/extractor/jeuxvideo.py --- 8d212e604a86da3c924ab15fe8045ab748a8183d diff --cc youtube_dl/extractor/jeuxvideo.py index d74a1c9b4,4327bc13d..c8a8ae1b3 --- a/youtube_dl/extractor/jeuxvideo.py +++ b/youtube_dl/extractor/jeuxvideo.py @@@ -18,6 -31,7 +31,8 @@@ class JeuxVideoIE(InfoExtractor) xml_config = self._download_webpage(xml_link, title, 'Downloading XML config') ++ + config = xml.etree.ElementTree.fromstring(xml_config.encode('utf-8')) info = re.search(r'(.*?)', xml_config, re.MULTILINE|re.DOTALL).group(1) info = json.loads(info)['versions'][0]