aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/internetvideoarchive.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-11-23 22:10:26 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-11-23 22:10:26 +0100
commit27f8b0994e9924724c974f46435552d401f5fc08 (patch)
treefa3ab829cc1e81a43f955ca9442ce59dfee6440b /youtube_dl/extractor/internetvideoarchive.py
parente311b6389a7582eef6f3f8ca4b41edd4efd6cd55 (diff)
parentfab6d4c048f56aa1c36897396a7fb590ae415d66 (diff)
downloadyoutube-dl-27f8b0994e9924724c974f46435552d401f5fc08.tar.xz
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/internetvideoarchive.py')
-rw-r--r--youtube_dl/extractor/internetvideoarchive.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py
index c137f4a5d..1e4799187 100644
--- a/youtube_dl/extractor/internetvideoarchive.py
+++ b/youtube_dl/extractor/internetvideoarchive.py
@@ -45,22 +45,26 @@ class InternetVideoArchiveIE(InfoExtractor):
url = self._build_url(query)
flashconfiguration = self._download_xml(url, video_id,
- 'Downloading flash configuration')
+ 'Downloading flash configuration')
file_url = flashconfiguration.find('file').text
file_url = file_url.replace('/playlist.aspx', '/mrssplaylist.aspx')
# Replace some of the parameters in the query to get the best quality
# and http links (no m3u8 manifests)
file_url = re.sub(r'(?<=\?)(.+)$',
- lambda m: self._clean_query(m.group()),
- file_url)
+ lambda m: self._clean_query(m.group()),
+ file_url)
info = self._download_xml(file_url, video_id,
- 'Downloading video info')
+ 'Downloading video info')
item = info.find('channel/item')
def _bp(p):
- return xpath_with_ns(p,
- {'media': 'http://search.yahoo.com/mrss/',
- 'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats'})
+ return xpath_with_ns(
+ p,
+ {
+ 'media': 'http://search.yahoo.com/mrss/',
+ 'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats',
+ }
+ )
formats = []
for content in item.findall(_bp('media:group/media:content')):
attr = content.attrib