From e6c9f80c4814de3e2aa60394d08e0d0bcf52de4e Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Mon, 16 Jun 2014 19:29:23 +0200 Subject: [PATCH 1/2] tv.nrk.no urls mostly contain capital characters Updated regexp and one of the test cases to reflect this. tv.nrksuper.no mostly uses lowercase, so that is still there. --- youtube_dl/extractor/nrk.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py index 1f066cf05..527e431d7 100644 --- a/youtube_dl/extractor/nrk.py +++ b/youtube_dl/extractor/nrk.py @@ -72,11 +72,11 @@ class NRKIE(InfoExtractor): class NRKTVIE(InfoExtractor): - _VALID_URL = r'http://tv\.nrk(?:super)?\.no/(?:serie/[^/]+|program)/(?P[a-z]{4}\d{8})' + _VALID_URL = r'http://tv\.nrk(?:super)?\.no/(?:serie/[^/]+|program)/(?P[a-zA-Z]{4}\d{8})' _TESTS = [ { - 'url': 'http://tv.nrk.no/serie/20-spoersmaal-tv/muhh48000314/23-05-2014', + 'url': 'http://tv.nrk.no/serie/20-spoersmaal-tv/MUHH48000314/23-05-2014', 'md5': '7b96112fbae1faf09a6f9ae1aff6cb84', 'info_dict': { 'id': 'muhh48000314', @@ -141,4 +141,4 @@ class NRKTVIE(InfoExtractor): 'upload_date': upload_date, 'duration': duration, 'formats': formats, - } \ No newline at end of file + } From 70126312570805b09efcbb511d6d049b8de30c01 Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Mon, 16 Jun 2014 19:37:59 +0200 Subject: [PATCH 2/2] Fix test Didn't use .lower() as planned, so update test with new ID. --- youtube_dl/extractor/nrk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py index 527e431d7..96f0ae1eb 100644 --- a/youtube_dl/extractor/nrk.py +++ b/youtube_dl/extractor/nrk.py @@ -79,7 +79,7 @@ class NRKTVIE(InfoExtractor): 'url': 'http://tv.nrk.no/serie/20-spoersmaal-tv/MUHH48000314/23-05-2014', 'md5': '7b96112fbae1faf09a6f9ae1aff6cb84', 'info_dict': { - 'id': 'muhh48000314', + 'id': 'MUHH48000314', 'ext': 'flv', 'title': '20 spørsmål', 'description': 'md5:bdea103bc35494c143c6a9acdd84887a',