about summary refs log tree commit diff
path: root/youtube_dl/extractor/instagram.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-06-08 01:17:21 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-06-08 01:17:21 +0800
commitedb99d4c18475ba27fae4f7d0ec6e3db9b574885 (patch)
treef140b2d5d9a2db4963d02ccae350486d28a0e4e3 /youtube_dl/extractor/instagram.py
parent68477c3dab97733eb7a2feb8fcc90f648c29c2b4 (diff)
downloadyoutube-dl-edb99d4c18475ba27fae4f7d0ec6e3db9b574885.tar.gz
youtube-dl-edb99d4c18475ba27fae4f7d0ec6e3db9b574885.tar.xz
youtube-dl-edb99d4c18475ba27fae4f7d0ec6e3db9b574885.zip
[instagram] Handling null values (fixes #5919)
I didn't add the test case here because it takes too much time. (7
minutes on my machine)
Diffstat (limited to 'youtube_dl/extractor/instagram.py')
-rw-r--r--youtube_dl/extractor/instagram.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py
index b10755788..b92367a9d 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dl/extractor/instagram.py
@@ -100,7 +100,9 @@ class InstagramUserIE(InfoExtractor):
                 thumbnails_el = it.get('images', {})
                 thumbnail = thumbnails_el.get('thumbnail', {}).get('url')
 
-                title = it.get('caption', {}).get('text', it['id'])
+                # In some cases caption is null, which corresponds to None
+                # in python. As a result, it.get('caption', {}) gives None
+                title = (it.get('caption') or {}).get('text', it['id'])
 
                 entries.append({
                     'id': it['id'],