Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Pierre Rudloff 2013-08-22 12:54:17 +02:00
parent 8d212e604a
commit 7070b83687

View File

@ -31,7 +31,6 @@ def _real_extract(self, url):
xml_config = self._download_webpage(xml_link, title, xml_config = self._download_webpage(xml_link, title,
'Downloading XML config') 'Downloading XML config')
config = xml.etree.ElementTree.fromstring(xml_config.encode('utf-8')) config = xml.etree.ElementTree.fromstring(xml_config.encode('utf-8'))
info = re.search(r'<format\.json>(.*?)</format\.json>', info = re.search(r'<format\.json>(.*?)</format\.json>',
xml_config, re.MULTILINE|re.DOTALL).group(1) xml_config, re.MULTILINE|re.DOTALL).group(1)