Merge branch 'fstirlitz-filmon'

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 522ef7d8bd2864bce610b786001dd242bc7ea25b..aa235bec1aeef1090c30e7a7b4f4af3cdfece6c2 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -30,8 +30,10 @@ from .aenetworks import (
     AENetworksIE,
     HistoryTopicIE,
 )
     AENetworksIE,
     HistoryTopicIE,
 )

-from .afreecatv import AfreecaTVIE
-from .aftonbladet import AftonbladetIE
+from .afreecatv import (
+    AfreecaTVIE,
+    AfreecaTVGlobalIE,
+)

 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE


@@ -39,10 +41,7 @@ from .amcnetworks import AMCNetworksIE
 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE

-from .aol import (
-    AolIE,
-    AolFeaturesIE,
-)
+from .aol import AolIE

 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE


@@ -67,6 +66,7 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,

+    TheOperaPlatformIE,

     ArteTVPlaylistIE,
 )
 from .atresplayer import AtresPlayerIE
     ArteTVPlaylistIE,
 )
 from .atresplayer import AtresPlayerIE


@@ -80,6 +80,10 @@ from .awaan import (
     AWAANLiveIE,
     AWAANSeasonIE,
 )
     AWAANLiveIE,
     AWAANSeasonIE,
 )

+from .azmedien import (
+    AZMedienIE,
+    AZMedienPlaylistIE,
+)

 from .azubu import AzubuIE, AzubuLiveIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .azubu import AzubuIE, AzubuLiveIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE


@@ -91,13 +95,18 @@ from .bbc import (
     BBCCoUkPlaylistIE,
     BBCIE,
 )
     BBCCoUkPlaylistIE,
     BBCIE,
 )

+from .beampro import BeamProLiveIE

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE

-from .beatportpro import BeatportProIE
+from .bellmedia import BellMediaIE
+from .beatport import BeatportIE

 from .bet import BetIE
 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bet import BetIE
 from .bigflix import BigflixIE
 from .bild import BildIE

-from .bilibili import BiliBiliIE
+from .bilibili import (
+    BiliBiliIE,
+    BiliBiliBangumiIE,
+)

 from .biobiochiletv import BioBioChileTVIE
 from .biqle import BIQLEIE
 from .bleacherreport import (
 from .biobiochiletv import BioBioChileTVIE
 from .biqle import BIQLEIE
 from .bleacherreport import (


@@ -116,7 +125,10 @@ from .brightcove import (
     BrightcoveNewIE,
 )
 from .buzzfeed import BuzzFeedIE
     BrightcoveNewIE,
 )
 from .buzzfeed import BuzzFeedIE

-from .byutv import BYUtvIE
+from .byutv import (
+    BYUtvIE,
+    BYUtvEventIE,
+)

 from .c56 import C56IE
 from .camdemy import (
     CamdemyIE,
 from .c56 import C56IE
 from .camdemy import (
     CamdemyIE,


@@ -146,6 +158,7 @@ from .cbsnews import (
 )
 from .cbssports import CBSSportsIE
 from .ccc import CCCIE
 )
 from .cbssports import CBSSportsIE
 from .ccc import CCCIE

+from .ccma import CCMAIE

 from .cctv import CCTVIE
 from .cda import CDAIE
 from .ceskatelevize import CeskaTelevizeIE
 from .cctv import CCTVIE
 from .cda import CDAIE
 from .ceskatelevize import CeskaTelevizeIE


@@ -176,6 +189,7 @@ from .cnn import (
 from .coub import CoubIE
 from .collegerama import CollegeRamaIE
 from .comedycentral import (
 from .coub import CoubIE
 from .collegerama import CollegeRamaIE
 from .comedycentral import (

+    ComedyCentralFullEpisodesIE,

     ComedyCentralIE,
     ComedyCentralShortnameIE,
     ComedyCentralTVIE,
     ComedyCentralIE,
     ComedyCentralShortnameIE,
     ComedyCentralTVIE,


@@ -183,7 +197,10 @@ from .comedycentral import (
 )
 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 )
 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE

-from .commonprotocols import RtmpIE
+from .commonprotocols import (
+    MmsIE,
+    RtmpIE,
+)

 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE


@@ -195,7 +212,6 @@ from .crunchyroll import (
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE

-from .ctv import CTVIE

 from .ctvnews import CTVNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .curiositystream import (
 from .ctvnews import CTVNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .curiositystream import (


@@ -238,6 +254,7 @@ from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .discoverygo import DiscoveryGoIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .discoverygo import DiscoveryGoIE

+from .disney import DisneyIE

 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE
 from .dw import (
 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE
 from .dw import (


@@ -247,6 +264,7 @@ from .dw import (
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE

+from .egghead import EggheadCourseIE

 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE


@@ -261,7 +279,10 @@ from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE

-from .espn import ESPNIE
+from .espn import (
+    ESPNIE,
+    ESPNArticleIE,
+)

 from .esri import EsriVideoIE
 from .europa import EuropaIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .esri import EsriVideoIE
 from .europa import EuropaIE
 from .everyonesmixtape import EveryonesMixtapeIE


@@ -278,6 +299,10 @@ from .fc2 import (
     FC2EmbedIE,
 )
 from .fczenit import FczenitIE
     FC2EmbedIE,
 )
 from .fczenit import FczenitIE

+from .filmon import (
+    FilmOnIE,
+    FilmOnChannelIE,
+)

 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE


@@ -290,9 +315,11 @@ from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .fourtube import FourTubeIE
 from .fox import FOXIE
 from .formula1 import Formula1IE
 from .fourtube import FourTubeIE
 from .fox import FOXIE

+from .fox9 import FOX9IE

 from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,
 from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,

+    FoxNewsArticleIE,

     FoxNewsInsiderIE,
 )
 from .foxsports import FoxSportsIE
     FoxNewsInsiderIE,
 )
 from .foxsports import FoxSportsIE


@@ -307,7 +334,6 @@ from .francetv import (
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE

-from .freevideo import FreeVideoIE

 from .funimation import FunimationIE
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .funimation import FunimationIE
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE


@@ -342,7 +368,10 @@ from .goshgay import GoshgayIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE

-from .hbo import HBOIE
+from .hbo import (
+    HBOIE,
+    HBOEpisodeIE,
+)

 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE


@@ -354,6 +383,7 @@ from .hgtv import (
 )
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 )
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE

+from .hitrecord import HitRecordIE

 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import HotStarIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import HotStarIE


@@ -363,6 +393,7 @@ from .hrti import (
     HRTiIE,
     HRTiPlaylistIE,
 )
     HRTiIE,
     HRTiPlaylistIE,
 )

+from .huajiao import HuajiaoIE

 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE


@@ -380,6 +411,7 @@ from .imgur import (
     ImgurAlbumIE,
 )
 from .ina import InaIE
     ImgurAlbumIE,
 )
 from .ina import InaIE

+from .inc import IncIE

 from .indavideo import (
     IndavideoIE,
     IndavideoEmbedIE,
 from .indavideo import (
     IndavideoIE,
     IndavideoEmbedIE,


@@ -390,12 +422,18 @@ from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .ir90tv import Ir90TvIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .ir90tv import Ir90TvIE

+from .itv import ITVIE

 from .ivi import (
     IviIE,
     IviCompilationIE
 )
 from .ivideon import IvideonIE
 from .ivi import (
     IviIE,
     IviCompilationIE
 )
 from .ivideon import IvideonIE

+from .iwara import IwaraIE

 from .izlesene import IzleseneIE
 from .izlesene import IzleseneIE

+from .jamendo import (
+    JamendoIE,
+    JamendoAlbumIE,
+)

 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jwplatform import JWPlatformIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jwplatform import JWPlatformIE


@@ -407,6 +445,7 @@ from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .karrierevideos import KarriereVideosIE
 from .keezmovies import KeezMoviesIE
 from .karaoketv import KaraoketvIE
 from .karrierevideos import KarriereVideosIE
 from .keezmovies import KeezMoviesIE

+from .ketnet import KetnetIE

 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE


@@ -424,7 +463,10 @@ from .kuwo import (
     KuwoMvIE,
 )
 from .la7 import LA7IE
     KuwoMvIE,
 )
 from .la7 import LA7IE

-from .laola1tv import Laola1TvIE
+from .laola1tv import (
+    Laola1TvEmbedIE,
+    Laola1TvIE,
+)

 from .lci import LCIIE
 from .lcp import (
     LcpPlayIE,
 from .lci import LCIIE
 from .lcp import (
     LcpPlayIE,


@@ -432,6 +474,7 @@ from .lcp import (
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE

+from .lego import LEGOIE

 from .lemonde import LemondeIE
 from .leeco import (
     LeIE,
 from .lemonde import LemondeIE
 from .leeco import (
     LeIE,


@@ -469,8 +512,14 @@ from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE
 from .mailru import MailRuIE
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE

+from .mangomolo import (
+    MangomoloVideoIE,
+    MangomoloLiveIE,
+)

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE

+from .meipai import MeipaiIE
+from .melonvod import MelonVODIE

 from .meta import METAIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .meta import METAIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE


@@ -509,8 +558,10 @@ from .movingimage import MovingImageIE
 from .msn import MSNIE
 from .mtv import (
     MTVIE,
 from .msn import MSNIE
 from .mtv import (
     MTVIE,

+    MTVVideoIE,

     MTVServicesEmbeddedIE,
     MTVDEIE,
     MTVServicesEmbeddedIE,
     MTVDEIE,

+    MTV81IE,

 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE


@@ -531,6 +582,7 @@ from .nbc import (
     CSNNEIE,
     NBCIE,
     NBCNewsIE,
     CSNNEIE,
     NBCIE,
     NBCNewsIE,

+    NBCOlympicsIE,

     NBCSportsIE,
     NBCSportsVPlayerIE,
 )
     NBCSportsIE,
     NBCSportsVPlayerIE,
 )


@@ -559,6 +611,7 @@ from .nextmedia import (
     NextMediaIE,
     NextMediaActionNewsIE,
     AppleDailyIE,
     NextMediaIE,
     NextMediaActionNewsIE,
     AppleDailyIE,

+    NextTVIE,

 )
 from .nfb import NFBIE
 from .nfl import NFLIE
 )
 from .nfb import NFBIE
 from .nfl import NFLIE


@@ -572,6 +625,7 @@ from .nhl import (
 from .nick import (
     NickIE,
     NickDeIE,
 from .nick import (
     NickIE,
     NickDeIE,

+    NickNightIE,

 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import (
 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import (


@@ -581,6 +635,7 @@ from .ninecninemedia import (
 from .ninegag import NineGagIE
 from .ninenow import NineNowIE
 from .nintendo import NintendoIE
 from .ninegag import NineGagIE
 from .ninenow import NineNowIE
 from .nintendo import NintendoIE

+from .nobelprize import NobelPrizeIE

 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE


@@ -603,13 +658,14 @@ from .nowtv import (
 )
 from .noz import NozIE
 from .npo import (
 )
 from .noz import NozIE
 from .npo import (

+    AndereTijdenIE,

     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     SchoolTVIE,
     VPROIE,
     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     SchoolTVIE,
     VPROIE,

-    WNLIE
+    WNLIE,

 )
 from .npr import NprIE
 from .nrk import (
 )
 from .npr import NprIE
 from .nrk import (


@@ -617,6 +673,9 @@ from .nrk import (
     NRKPlaylistIE,
     NRKSkoleIE,
     NRKTVIE,
     NRKPlaylistIE,
     NRKSkoleIE,
     NRKTVIE,

+    NRKTVDirekteIE,
+    NRKTVEpisodesIE,
+    NRKTVSeriesIE,

 )
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 )
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE


@@ -625,9 +684,11 @@ from .nytimes import (
     NYTimesArticleIE,
 )
 from .nuvid import NuvidIE
     NYTimesArticleIE,
 )
 from .nuvid import NuvidIE

+from .nzz import NZZIE

 from .odatv import OdaTVIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE
 from .odatv import OdaTVIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE

+from .ondemandkorea import OnDemandKoreaIE

 from .onet import (
     OnetIE,
     OnetChannelIE,
 from .onet import (
     OnetIE,
     OnetChannelIE,


@@ -645,6 +706,7 @@ from .orf import (
     ORFFM4IE,
     ORFIPTVIE,
 )
     ORFFM4IE,
     ORFIPTVIE,
 )

+from .pandatv import PandaTVIE

 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE


@@ -657,6 +719,7 @@ from .periscope import (
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE

+from .piksel import PikselIE

 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .playfm import PlayFMIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .playfm import PlayFMIE


@@ -670,9 +733,13 @@ from .pluralsight import (
 )
 from .podomatic import PodomaticIE
 from .pokemon import PokemonIE
 )
 from .podomatic import PodomaticIE
 from .pokemon import PokemonIE

-from .polskieradio import PolskieRadioIE
+from .polskieradio import (
+    PolskieRadioIE,
+    PolskieRadioCategoryIE,
+)

 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE

+from .pornflip import PornFlipIE

 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,
 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,


@@ -715,6 +782,10 @@ from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .rds import RDSIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE

+from .rentv import (
+    RENTVIE,
+    RENTVArticleIE,
+)

 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE
 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE


@@ -724,6 +795,7 @@ from .revision3 import (
 )
 from .rice import RICEIE
 from .ringtv import RingTVIE
 )
 from .rice import RICEIE
 from .ringtv import RingTVIE

+from .rmcdecouverte import RMCDecouverteIE

 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE
 from .roosterteeth import RoosterTeethIE
 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE
 from .roosterteeth import RoosterTeethIE


@@ -762,16 +834,17 @@ from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE

-from .screenjunkies import ScreenJunkiesIE
-from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE

 from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .shahid import ShahidIE
 from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .shahid import ShahidIE

-from .shared import SharedIE
-from .sharesix import ShareSixIE
+from .shared import (
+    SharedIE,
+    VivoIE,
+)
+from .showroomlive import ShowRoomLiveIE

 from .sina import SinaIE
 from .sixplay import SixPlayIE
 from .skynewsarabia import (
 from .sina import SinaIE
 from .sixplay import SixPlayIE
 from .skynewsarabia import (


@@ -853,6 +926,7 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE

+from .teamfourstar import TeamFourStarIE

 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE


@@ -860,10 +934,12 @@ from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE

+from .telequebec import TeleQuebecIE

 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE

+from .tfo import TFOIE

 from .theintercept import TheInterceptIE
 from .theplatform import (
     ThePlatformIE,
 from .theintercept import TheInterceptIE
 from .theplatform import (
     ThePlatformIE,


@@ -872,8 +948,10 @@ from .theplatform import (
 from .thescene import TheSceneIE
 from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE
 from .thescene import TheSceneIE
 from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE

+from .theweatherchannel import TheWeatherChannelIE

 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE

+from .thisoldhouse import ThisOldHouseIE

 from .threeqsdn import ThreeQSDNIE
 from .tinypic import TinyPicIE
 from .tlc import TlcDeIE
 from .threeqsdn import ThreeQSDNIE
 from .tinypic import TinyPicIE
 from .tlc import TlcDeIE


@@ -888,11 +966,11 @@ from .tnaflix import (
     MovieFapIE,
 )
 from .toggle import ToggleIE
     MovieFapIE,
 )
 from .toggle import ToggleIE

+from .tonline import TOnlineIE

 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE

-from .trollvids import TrollvidsIE

 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE


@@ -917,6 +995,11 @@ from .tv2 import (
 )
 from .tv3 import TV3IE
 from .tv4 import TV4IE
 )
 from .tv3 import TV3IE
 from .tv4 import TV4IE

+from .tva import TVAIE
+from .tvanouvelles import (
+    TVANouvellesIE,
+    TVANouvellesArticleIE,
+)

 from .tvc import (
     TVCIE,
     TVCArticleIE,
 from .tvc import (
     TVCIE,
     TVCArticleIE,


@@ -945,7 +1028,10 @@ from .twitch import (
     TwitchChapterIE,
     TwitchVodIE,
     TwitchProfileIE,
     TwitchChapterIE,
     TwitchVodIE,
     TwitchProfileIE,

+    TwitchAllVideosIE,
+    TwitchUploadsIE,

     TwitchPastBroadcastsIE,
     TwitchPastBroadcastsIE,

+    TwitchHighlightsIE,

     TwitchStreamIE,
     TwitchClipsIE,
 )
     TwitchStreamIE,
     TwitchClipsIE,
 )


@@ -959,6 +1045,7 @@ from .udemy import (
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

+from .uktvplay import UKTVPlayIE

 from .digiteka import DigitekaIE
 from .unistra import UnistraIE
 from .uol import UOLIE
 from .digiteka import DigitekaIE
 from .unistra import UnistraIE
 from .uol import UOLIE


@@ -998,6 +1085,7 @@ from .vice import (
 from .viceland import VicelandIE
 from .vidbit import VidbitIE
 from .viddler import ViddlerIE
 from .viceland import VicelandIE
 from .vidbit import VidbitIE
 from .viddler import ViddlerIE

+from .videa import VideaIE

 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE


@@ -1007,7 +1095,6 @@ from .videomore import (
     VideomoreSeasonIE,
 )
 from .videopremium import VideoPremiumIE
     VideomoreSeasonIE,
 )
 from .videopremium import VideoPremiumIE

-from .videott import VideoTtIE

 from .vidio import VidioIE
 from .vidme import (
     VidmeIE,
 from .vidio import VidioIE
 from .vidme import (
     VidmeIE,


@@ -1042,12 +1129,20 @@ from .viki import (
     VikiIE,
     VikiChannelIE,
 )
     VikiIE,
     VikiChannelIE,
 )

+from .viu import (
+    ViuIE,
+    ViuPlaylistIE,
+    ViuOTTIE,
+)

 from .vk import (
     VKIE,
     VKUserVideosIE,
     VKWallPostIE,
 )
 from .vk import (
     VKIE,
     VKUserVideosIE,
     VKWallPostIE,
 )

-from .vlive import VLiveIE
+from .vlive import (
+    VLiveIE,
+    VLiveChannelIE
+)

 from .vodlocker import VodlockerIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE
 from .vodlocker import VodlockerIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE


@@ -1056,6 +1151,9 @@ from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE

+from .vvvvid import VVVVIDIE
+from .vyborymos import VyboryMosIE
+from .vzaar import VzaarIE

 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,
 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,


@@ -1067,6 +1165,10 @@ from .wdr import (
     WDRIE,
     WDRMobileIE,
 )
     WDRIE,
     WDRMobileIE,
 )

+from .webcaster import (
+    WebcasterIE,
+    WebcasterFeedIE,
+)

 from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,