summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAllan Zhou <[email protected]>2013-08-19 18:57:55 -0700
committerAllan Zhou <[email protected]>2013-08-19 18:57:55 -0700
commit211fbc1328edda1752fce9dc5ed604b98f9dc865 (patch)
tree8c2eeada81970148856d2f166592b8ec47f4fe16
parent836a086ce9d48338444f010f690119a9a3998517 (diff)
downloadyoutube-dl-211fbc1328edda1752fce9dc5ed604b98f9dc865.tar.gz
youtube-dl-211fbc1328edda1752fce9dc5ed604b98f9dc865.zip
fix failed tests
-rw-r--r--youtube_dl/extractor/youtube.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 248105d7f..bdd399d3e 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -777,10 +777,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
if m_s is not None:
self.to_screen(u'%s: Encrypted signatures detected.' % video_id)
video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']]
- m_s = re.search(r'[&,]s=', args['adaptive_fmts'])
- if m_s is not None:
+ m_s = re.search(r'[&,]s=', args['adaptive_fmts'] if 'adaptive_fmts' in args else '')
+ if m_s is not None and 'adaptive_fmts' in args:
video_info['url_encoded_fmt_stream_map'][0] += ','+args['adaptive_fmts']
- else:
+ elif 'adaptive_fmts' in video_info:
video_info['url_encoded_fmt_stream_map'][0] += ','+video_info['adaptive_fmts'][0]
except ValueError: