diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-09-16 03:32:53 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-09-16 03:32:53 +0200 |
| commit | ef66b0c6effb9d8741807abb12b059560c97c8da (patch) | |
| tree | 8230663fc475477863b78884078bba918a1edea4 /youtube_dl/extractor/trilulilu.py | |
| parent | 22b50ecb2f7f9e0469d281a4c401d4a531c1cc5b (diff) | |
| parent | 5a6fecc3dee35f95f3590a31e51670819db5a1fe (diff) | |
| download | youtube-dl-ef66b0c6effb9d8741807abb12b059560c97c8da.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/extractor/trilulilu.py')
| -rw-r--r-- | youtube_dl/extractor/trilulilu.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/trilulilu.py b/youtube_dl/extractor/trilulilu.py index f278951ba..0bf028f61 100644 --- a/youtube_dl/extractor/trilulilu.py +++ b/youtube_dl/extractor/trilulilu.py @@ -52,6 +52,7 @@ class TriluliluIE(InfoExtractor): { 'format': fnode.text, 'url': video_url_template % fnode.text, + 'ext': fnode.text.partition('-')[0] } for fnode in format_doc.findall('./formats/format') @@ -67,7 +68,6 @@ class TriluliluIE(InfoExtractor): } # TODO: Remove when #980 has been merged - info['url'] = formats[-1]['url'] - info['ext'] = formats[-1]['format'].partition('-')[0] + info.update(formats[-1]) return info |