From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 2 Feb 2015 19:43:02 +0000 (+0100)
Subject: [ntvru] Rename from NTV to clarify the difference between n-tv.de and ntv.ru
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=3fd45e03bf86c2ad2ef17362452a9a745dc10755;p=youtube-dl

[ntvru] Rename from NTV to clarify the difference between n-tv.de and ntv.ru
---

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index dabf86ec8..bd707e028 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -317,7 +317,7 @@ from .nrk import (
     NRKIE,
     NRKTVIE,
 )
-from .ntv import NTVIE
+from .ntvru import NTVRuIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE
 from .oktoberfesttv import OktoberfestTVIE
diff --git a/youtube_dl/extractor/ntv.py b/youtube_dl/extractor/ntvru.py
similarity index 97%
rename from youtube_dl/extractor/ntv.py
rename to youtube_dl/extractor/ntvru.py
index ee740cd9c..8b9166d48 100644
--- a/youtube_dl/extractor/ntv.py
+++ b/youtube_dl/extractor/ntvru.py
@@ -9,7 +9,7 @@ from ..utils import (
 )
 
 
-class NTVIE(InfoExtractor):
+class NTVRuIE(InfoExtractor):
     _VALID_URL = r'http://(?:www\.)?ntv\.ru/(?P<id>.+)'
 
     _TESTS = [
@@ -92,9 +92,7 @@ class NTVIE(InfoExtractor):
     ]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
+        video_id = self._match_id(url)
         page = self._download_webpage(url, video_id)
 
         video_id = self._html_search_regex(self._VIDEO_ID_REGEXES, page, 'video id')