From: Remita Amine Date: Sun, 7 May 2017 08:31:14 +0000 (+0100) Subject: [nbc] remove unused imports and extract permalink from modified urls X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=52294cdda761ad08785e7118ae8e121ceef257ec;p=youtube-dl [nbc] remove unused imports and extract permalink from modified urls --- 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',