X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnbc.py;h=62db70b438d365eb60609beaa6bbad9e2d9fc7d4;hb=ca127ab2c174cdee4428eb4e192393c6ca942ac8;hp=3b31ca3ef1e1b8c2dc60286ee0a22bed75e4b58a;hpb=2eeb588efe9a7df4b2dcd90de9e461e8ff4a40fa;p=youtube-dl diff --git a/youtube_dl/extractor/nbc.py b/youtube_dl/extractor/nbc.py index 3b31ca3ef..62db70b43 100644 --- a/youtube_dl/extractor/nbc.py +++ b/youtube_dl/extractor/nbc.py @@ -5,10 +5,8 @@ import re from .common import InfoExtractor from .theplatform import ThePlatformIE from .adobepass import AdobePassIE -from ..compat import compat_urllib_parse_urlparse from ..utils import ( find_xpath_attr, - lowercase_escape, smuggle_url, unescapeHTML, update_url_query, @@ -17,7 +15,7 @@ from ..utils import ( class NBCIE(AdobePassIE): - _VALID_URL = r'https?://(?:www\.)?nbc\.com/[^/]+/video/[^/]+/(?Pn?\d+)' + _VALID_URL = r'(?Phttps?://(?:www\.)?nbc\.com/[^/]+/video/[^/]+/(?Pn?\d+))' _TESTS = [ { @@ -73,10 +71,10 @@ class NBCIE(AdobePassIE): ] def _real_extract(self, url): - video_id = self._match_id(url) + permalink, video_id = re.match(self._VALID_URL, url).groups() video_data = self._download_json( 'https://api.nbc.com/v3/videos', video_id, query={ - 'filter[permalink]': url, + 'filter[permalink]': permalink, })['data'][0]['attributes'] query = { 'mbr': 'true',