diff options
| author | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 | 
|---|---|---|
| committer | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 | 
| commit | c4f731262dbee921147b94aac5035b5d9ec75502 (patch) | |
| tree | 98a93f1de2b7c71a8e25fa072515b4efc5f43ea1 /youtube_dl/extractor/cnet.py | |
| parent | 07cc63f386c6afe253b7707631663072d2fb8789 (diff) | |
| parent | e42a692f003eabdb1efad7b9f4b10ce97c712d32 (diff) | |
Merge remote-tracking branch 'upstream/master' into MLB
Conflicts:
	youtube_dl/extractor/mlb.py
Diffstat (limited to 'youtube_dl/extractor/cnet.py')
| -rw-r--r-- | youtube_dl/extractor/cnet.py | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/extractor/cnet.py b/youtube_dl/extractor/cnet.py index a94f42571..710d5009b 100644 --- a/youtube_dl/extractor/cnet.py +++ b/youtube_dl/extractor/cnet.py @@ -43,7 +43,11 @@ class CNETIE(InfoExtractor):              raise ExtractorError('Cannot find video data')          video_id = vdata['id'] -        title = vdata['headline'] +        title = vdata.get('headline') +        if title is None: +            title = vdata.get('title') +        if title is None: +            raise ExtractorError('Cannot find title!')          description = vdata.get('dek')          thumbnail = vdata.get('image', {}).get('path')          author = vdata.get('author')  | 
