From 954c1d05299ae7c6a51db46c1ac33ddf150266c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Fri, 12 Jun 2015 16:24:13 +0600
Subject: [PATCH] [tvc] Refactor extractor names
---
youtube_dl/extractor/__init__.py | 2 +-
youtube_dl/extractor/generic.py | 4 ++--
youtube_dl/extractor/tvc.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index a8d3a8928..18b1c5e54 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -586,7 +586,7 @@ from .tv2 import (
from .tv4 import TV4IE
from .tvc import (
TVCIE,
- TVCEmbedIE,
+ TVCArticleIE,
)
from .tvigle import TvigleIE
from .tvp import TvpIE, TvpSeriesIE
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index c797c4b52..507e4a571 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -34,7 +34,7 @@ from .brightcove import BrightcoveIE
from .nbc import NBCSportsVPlayerIE
from .ooyala import OoyalaIE
from .rutv import RUTVIE
-from .tvc import TVCEmbedIE
+from .tvc import TVCIE
from .sportbox import SportBoxEmbedIE
from .smotri import SmotriIE
from .condenast import CondeNastIE
@@ -1303,7 +1303,7 @@ class GenericIE(InfoExtractor):
return self.url_result(rutv_url, 'RUTV')
# Look for embedded TVC player
- rutv_url = TVCEmbedIE._extract_url(webpage)
+ rutv_url = TVCIE._extract_url(webpage)
if rutv_url:
return self.url_result(rutv_url, 'TVCEmbed')
diff --git a/youtube_dl/extractor/tvc.py b/youtube_dl/extractor/tvc.py
index 756fec732..36c2a3196 100644
--- a/youtube_dl/extractor/tvc.py
+++ b/youtube_dl/extractor/tvc.py
@@ -10,7 +10,7 @@ from ..utils import (
)
-class TVCEmbedIE(InfoExtractor):
+class TVCIE(InfoExtractor):
_VALID_URL = r'http://(?:www\.)?tvc\.ru/video/iframe/id/(?P<id>\d+)'
_TEST = {
'url': 'http://www.tvc.ru/video/iframe/id/74622/isPlay/false/id_stat/channel/?acc_video_id=/channel/brand/id/17/show/episodes/episode_id/39702',
@@ -63,7 +63,7 @@ class TVCEmbedIE(InfoExtractor):
}
-class TVCIE(InfoExtractor):
+class TVCArticleIE(InfoExtractor):
_VALID_URL = r'http://(?:www\.)?tvc\.ru/(?!video/iframe/id/)(?P<id>[^?#]+)'
_TESTS = [{
'url': 'http://www.tvc.ru/channel/brand/id/29/show/episodes/episode_id/39702/',