diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-08-19 17:00:20 +0200 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-08-19 17:00:20 +0200 |
| commit | 0e4dc2fc746e75a6ca27830da3fea7b90ed0179e (patch) | |
| tree | f0142bfd4a4e61504541d03fb7f478c7895eab25 | |
| parent | 9bb8dc8e42da4e47008a0acd2a1d69e00193e02d (diff) | |
| parent | 55a1fa8a567540e38fbd9d8eb81ba98a7510203d (diff) | |
| download | youtube-dl-0e4dc2fc746e75a6ca27830da3fea7b90ed0179e.tar.xz | |
Merge 'rbrito/support-tube.majestyc.net' (PR #391) with small fix
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index ddb4aa16b..dfd8f76ee 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -95,7 +95,7 @@ class InfoExtractor(object): class YoutubeIE(InfoExtractor): """Information extractor for youtube.com.""" - _VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$' + _VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/|tube\.majestyc\.net/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$' _LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1' _LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en' _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en' |