about summary refs log tree commit diff
path: root/youtube_dl/extractor/archiveorg.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-03 14:21:06 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-03 14:31:20 +0100
commitfb7abb31af93a2a1d84ba17beb0f389dd09eafdb (patch)
treebc17045a740d06bc4825d76a8ce0b611721ef7a9 /youtube_dl/extractor/archiveorg.py
parentce93879a9b3b1661db3e65ec43649c5b6a08778c (diff)
downloadyoutube-dl-fb7abb31af93a2a1d84ba17beb0f389dd09eafdb.tar.gz
youtube-dl-fb7abb31af93a2a1d84ba17beb0f389dd09eafdb.tar.xz
youtube-dl-fb7abb31af93a2a1d84ba17beb0f389dd09eafdb.zip
Remove the compatibility code used before the new format system was implemented
Diffstat (limited to 'youtube_dl/extractor/archiveorg.py')
-rw-r--r--youtube_dl/extractor/archiveorg.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/youtube_dl/extractor/archiveorg.py b/youtube_dl/extractor/archiveorg.py
index 61ce4469a..3ae0aebb1 100644
--- a/youtube_dl/extractor/archiveorg.py
+++ b/youtube_dl/extractor/archiveorg.py
@@ -49,7 +49,7 @@ class ArchiveOrgIE(InfoExtractor):
         for f in formats:
             f['ext'] = determine_ext(f['url'])
 
-        info = {
+        return {
             '_type': 'video',
             'id': video_id,
             'title': title,
@@ -57,12 +57,5 @@ class ArchiveOrgIE(InfoExtractor):
             'description': description,
             'uploader': uploader,
             'upload_date': upload_date,
+            'thumbnail': data.get('misc', {}).get('image'),
         }
-        thumbnail = data.get('misc', {}).get('image')
-        if thumbnail:
-            info['thumbnail'] = thumbnail
-
-        # TODO: Remove when #980 has been merged
-        info.update(formats[-1])
-
-        return info