diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-08-28 00:58:24 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-08-28 00:58:24 +0200 |
| commit | 22a6f15061127045f4d6ae1ff4efc922fa372cc2 (patch) | |
| tree | f0df2ab32f301b3c66b6d9d147e49fe177e27a55 /youtube_dl/extractor/nhl.py | |
| parent | 259454525f9fe41947e6e05882336b7196fc8fce (diff) | |
| download | youtube-dl-22a6f15061127045f4d6ae1ff4efc922fa372cc2.tar.xz | |
Move playlist tests to extractors.
From now on, test_download will run these tests. That means we benefit not only from the networking setup in there, but also from the other tests (for example test_all_urls to find problems with _VALID_URLs).
Diffstat (limited to 'youtube_dl/extractor/nhl.py')
| -rw-r--r-- | youtube_dl/extractor/nhl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/nhl.py b/youtube_dl/extractor/nhl.py index 8a8acc955..ceda1dcc0 100644 --- a/youtube_dl/extractor/nhl.py +++ b/youtube_dl/extractor/nhl.py @@ -46,7 +46,7 @@ class NHLBaseInfoExtractor(InfoExtractor): class NHLIE(NHLBaseInfoExtractor): IE_NAME = 'nhl.com' - _VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console\?.*?(?<=[?&])id=(?P<id>\d+)' + _VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console\?.*?(?:[?&])id=(?P<id>[0-9]+)' _TEST = { 'url': 'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614', @@ -72,7 +72,7 @@ class NHLIE(NHLBaseInfoExtractor): class NHLVideocenterIE(NHLBaseInfoExtractor): IE_NAME = 'nhl.com:videocenter' IE_DESC = 'NHL videocenter category' - _VALID_URL = r'https?://video\.(?P<team>[^.]*)\.nhl\.com/videocenter/(console\?.*?catid=(?P<catid>[^&]+))?' + _VALID_URL = r'https?://video\.(?P<team>[^.]*)\.nhl\.com/videocenter/(console\?.*?catid=(?P<catid>[0-9]+)(?![&?]id=).*?)?$' _TEST = { 'url': 'http://video.canucks.nhl.com/videocenter/console?catid=999', 'info_dict': { |