diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-09-22 12:17:42 +0200 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-09-22 12:17:42 +0200 | 
| commit | bdde940e90320e350bd96df621ee7e32641e1eca (patch) | |
| tree | d0b4c963bba6d2a913dcc86336f9772f077bdc86 | |
| parent | 45f4a76dbc268a56c212fe25cd27922541840cfe (diff) | |
[youtube] Improve flash player URL handling
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 56ad33fdc..888907c93 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1437,10 +1437,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):                          encrypted_sig = url_data['s'][0]                          if self._downloader.params.get('verbose'):                              if age_gate: -                                player_version = self._search_regex( -                                    r'-(.+)\.swf$', -                                    player_url if player_url else None, -                                    'flash player', fatal=False) +                                if player_url is None: +                                    player_version = 'unknown' +                                else: +                                    player_version = self._search_regex( +                                        r'-(.+)\.swf$', player_url, +                                        u'flash player', fatal=False)                                  player_desc = 'flash player %s' % player_version                              else:                                  player_version = self._search_regex(  | 
