aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/extractors.py3
-rw-r--r--youtube_dl/extractor/freevideo.py38
2 files changed, 1 insertions, 40 deletions
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 9c1026ff7..811db6219 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -320,7 +320,6 @@ from .francetv import (
)
from .freesound import FreesoundIE
from .freespeech import FreespeechIE
-from .freevideo import FreeVideoIE
from .funimation import FunimationIE
from .funnyordie import FunnyOrDieIE
from .fusion import FusionIE
@@ -825,7 +824,7 @@ from .shared import (
VivoIE,
)
from .sharesix import ShareSixIE
-from .showroomlive import ShowroomLiveIE
+from .showroomlive import ShowRoomLiveIE
from .sina import SinaIE
from .sixplay import SixPlayIE
from .skynewsarabia import (
diff --git a/youtube_dl/extractor/freevideo.py b/youtube_dl/extractor/freevideo.py
deleted file mode 100644
index cd8423a6f..000000000
--- a/youtube_dl/extractor/freevideo.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import ExtractorError
-
-
-class FreeVideoIE(InfoExtractor):
- _VALID_URL = r'^https?://www.freevideo.cz/vase-videa/(?P<id>[^.]+)\.html(?:$|[?#])'
-
- _TEST = {
- 'url': 'http://www.freevideo.cz/vase-videa/vysukany-zadecek-22033.html',
- 'info_dict': {
- 'id': 'vysukany-zadecek-22033',
- 'ext': 'mp4',
- 'title': 'vysukany-zadecek-22033',
- 'age_limit': 18,
- },
- 'skip': 'Blocked outside .cz',
- }
-
- def _real_extract(self, url):
- video_id = self._match_id(url)
- webpage, handle = self._download_webpage_handle(url, video_id)
- if '//www.czechav.com/' in handle.geturl():
- raise ExtractorError(
- 'Access to freevideo is blocked from your location',
- expected=True)
-
- video_url = self._search_regex(
- r'\s+url: "(http://[a-z0-9-]+.cdn.freevideo.cz/stream/.*?/video.mp4)"',
- webpage, 'video URL')
-
- return {
- 'id': video_id,
- 'url': video_url,
- 'title': video_id,
- 'age_limit': 18,
- }