From: Allan Zhou <allanzp@gmail.com>
Date: Tue, 20 Aug 2013 01:57:55 +0000 (-0700)
Subject: fix failed tests
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=211fbc1328edda1752fce9dc5ed604b98f9dc865;p=youtube-dl

fix failed tests
---

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: