Merge remote-tracking branch 'pulpe/moviezinese'

[youtube-dl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index e0ef1cd3e9e751620a4f2fb0903e93ded952b276..e27cd2d2d5310d2a7889c645b6525aa0f1543125 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -20,6 +20,7 @@ from .auengine import AUEngineIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE

+from .bilibili import BiliBiliIE

 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE


@@ -40,6 +41,7 @@ from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE

+from .clubic import ClubicIE

 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (
 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (


@@ -158,6 +160,7 @@ from .mofosex import MofosexIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motorsport import MotorsportIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motorsport import MotorsportIE

+from .moviezine import MoviezineIE

 from .movshare import MovShareIE
 from .mtv import (
     MTVIE,
 from .movshare import MovShareIE
 from .mtv import (
     MTVIE,


@@ -186,6 +189,7 @@ from .normalboots import NormalbootsIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE

+from .nrk import NRKIE

 from .ntv import NTVIE
 from .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .ntv import NTVIE
 from .oe1 import OE1IE
 from .ooyala import OoyalaIE


@@ -207,6 +211,7 @@ from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE

+from .rtbf import RTBFIE

 from .rtlnow import RTLnowIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE
 from .rtlnow import RTLnowIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE


@@ -218,6 +223,7 @@ from .rutube import (
 )
 from .rutv import RUTVIE
 from .savefrom import SaveFromIE
 )
 from .rutv import RUTVIE
 from .savefrom import SaveFromIE

+from .scivee import SciVeeIE

 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE


@@ -290,11 +296,13 @@ from .vimeo import (
     VimeoAlbumIE,
     VimeoGroupsIE,
     VimeoReviewIE,
     VimeoAlbumIE,
     VimeoGroupsIE,
     VimeoReviewIE,

+    VimeoWatchLaterIE,

 )
 from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE
 )
 from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE

+from .vuclip import VuClipIE

 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wdr import (
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wdr import (