diff options
| author | Pierre Rudloff <contact@rudloff.pro> | 2013-09-17 23:07:44 +0200 |
|---|---|---|
| committer | Pierre Rudloff <contact@rudloff.pro> | 2013-09-17 23:07:44 +0200 |
| commit | 8f77093262b9613fcba73a101eb403ea9b275a33 (patch) | |
| tree | 60df504180de14955b865262f816f18f727b664e | |
| parent | d79a0e233a329e543797478a2eeb377e469c0f3f (diff) | |
| parent | 6523223a4c6f8924ac156b3fc2f5519a53b58e4b (diff) | |
Merge remote-tracking branch 'upstream/master' into websurg
| -rw-r--r-- | youtube_dl/extractor/hotnewhiphop.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py index ccca1d7e0..3798118a7 100644 --- a/youtube_dl/extractor/hotnewhiphop.py +++ b/youtube_dl/extractor/hotnewhiphop.py @@ -7,11 +7,11 @@ from .common import InfoExtractor class HotNewHipHopIE(InfoExtractor): _VALID_URL = r'http://www\.hotnewhiphop.com/.*\.(?P<id>.*)\.html' _TEST = { - u'url': u"http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html'", + u'url': u"http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html", u'file': u'1435540.mp3', u'md5': u'2c2cd2f76ef11a9b3b581e8b232f3d96', u'info_dict': { - u"title": u"Freddie Gibbs Songs - Lay It Down" + u"title": u"Freddie Gibbs - Lay It Down" } } diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 0c963fd20..f227e2086 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -783,10 +783,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): if self._downloader.params.get('verbose'): s = url_data['s'][0] if age_gate: - player_version = self._search_regex(r'ad3-(.+?)\.swf', - video_info['ad3_module'][0] if 'ad3_module' in video_info else 'NOT FOUND', - 'flash player', fatal=False) - player = 'flash player %s' % player_version + player = 'flash player' else: player = u'html5 player %s' % self._search_regex(r'html5player-(.+?)\.js', video_webpage, 'html5 player', fatal=False) |