Merge branch 'brightcove_in_page_embed' of https://github.com/remitamine/youtube...

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 462717b1e0aa6363d52dd5660ae6b4fc63eca559..08cb93d7689d3fcd55a47c33ced931fce03d4a8c 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -45,6 +45,7 @@ from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbc import (
     BBCCoUkIE,
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbc import (
     BBCCoUkIE,

+    BBCCoUkArticleIE,

     BBCIE,
 )
 from .beeg import BeegIE
     BBCIE,
 )
 from .beeg import BeegIE


@@ -59,7 +60,10 @@ from .bloomberg import BloombergIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE

-from .brightcove import BrightcoveIE
+from .brightcove import (
+    BrightcoveIE,
+    BrightcoveInPageEmbedIE,
+)

 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE


@@ -89,6 +93,7 @@ from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clipsyndicate import ClipsyndicateIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE

+from .clyp import ClypIE

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


@@ -122,6 +127,7 @@ from .dbtv import DBTVIE
 from .dcn import DCNIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dcn import DCNIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE

+from .democracynow import DemocracynowIE

 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE


@@ -209,13 +215,15 @@ from .gfycat import GfycatIE
 from .giantbomb import GiantBombIE
 from .giga import GigaIE
 from .glide import GlideIE
 from .giantbomb import GiantBombIE
 from .giga import GigaIE
 from .glide import GlideIE

-from .globo import GloboIE
+from .globo import (
+    GloboIE,
+    GloboArticleIE,
+)

 from .godtube import GodTubeIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .godtube import GodTubeIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE

-from .gorillavid import GorillaVidIE

 from .goshgay import GoshgayIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .goshgay import GoshgayIE
 from .groupon import GrouponIE
 from .hark import HarkIE


@@ -586,6 +594,7 @@ from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE

+from .stitcher import StitcherIE

 from .sport5 import Sport5IE
 from .sportbox import (
     SportBoxIE,
 from .sport5 import Sport5IE
 from .sportbox import (
     SportBoxIE,


@@ -690,7 +699,7 @@ from .twitch import (
     TwitchBookmarksIE,
     TwitchStreamIE,
 )
     TwitchBookmarksIE,
     TwitchStreamIE,
 )

-from .twitter import TwitterCardIE
+from .twitter import TwitterCardIE, TwitterIE

 from .ubu import UbuIE
 from .udemy import (
     UdemyIE,
 from .ubu import UbuIE
 from .udemy import (
     UdemyIE,


@@ -717,7 +726,6 @@ from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE
 from .videodetective import VideoDetectiveIE
 from .vice import ViceIE
 from .viddler import ViddlerIE
 from .videodetective import VideoDetectiveIE

-from .videolecturesnet import VideoLecturesNetIE

 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE
 from .videopremium import VideoPremiumIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE
 from .videopremium import VideoPremiumIE


@@ -727,6 +735,7 @@ from .vidme import VidmeIE
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE

+from .viidea import ViideaIE

 from .vimeo import (
     VimeoIE,
     VimeoAlbumIE,
 from .vimeo import (
     VimeoIE,
     VimeoAlbumIE,


@@ -779,6 +788,7 @@ from .wrzuta import WrzutaIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE

+from .xfileshare import XFileShareIE

 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,