[screenwavemedia] Remove extractor

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index d4d90c1f8d8dfa72894f74dd3a448716d48d592b..563457fcb93aa35b2c8dbb3904d8a0aab8cb0643 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1,12 +1,18 @@
 # flake8: noqa
 from __future__ import unicode_literals
 
 # flake8: noqa
 from __future__ import unicode_literals
 

-from .abc import ABCIE
-from .abc7news import Abc7NewsIE
+from .abc import (
+    ABCIE,
+    ABCIViewIE,
+)

 from .abcnews import (
     AbcNewsIE,
     AbcNewsVideoIE,
 )
 from .abcnews import (
     AbcNewsIE,
     AbcNewsVideoIE,
 )

+from .abcotvs import (
+    ABCOTVSIE,
+    ABCOTVSClipsIE,
+)

 from .academicearth import AcademicEarthCourseIE
 from .acast import (
     ACastIE,
 from .academicearth import AcademicEarthCourseIE
 from .acast import (
     ACastIE,


@@ -25,7 +31,6 @@ from .aenetworks import (
     HistoryTopicIE,
 )
 from .afreecatv import AfreecaTVIE
     HistoryTopicIE,
 )
 from .afreecatv import AfreecaTVIE

-from .aftonbladet import AftonbladetIE

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


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

+    TheOperaPlatformIE,

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


@@ -68,6 +74,12 @@ from .atttechchannel import ATTTechChannelIE
 from .audimedia import AudiMediaIE
 from .audioboom import AudioBoomIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .audimedia import AudiMediaIE
 from .audioboom import AudioBoomIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE

+from .awaan import (
+    AWAANIE,
+    AWAANVideoIE,
+    AWAANLiveIE,
+    AWAANSeasonIE,
+)

 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


@@ -81,7 +93,8 @@ from .bbc import (
 )
 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


@@ -104,7 +117,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,


@@ -118,9 +134,12 @@ from .carambatv import (
     CarambaTVIE,
     CarambaTVPageIE,
 )
     CarambaTVIE,
     CarambaTVPageIE,
 )

+from .cartoonnetwork import CartoonNetworkIE

 from .cbc import (
     CBCIE,
     CBCPlayerIE,
 from .cbc import (
     CBCIE,
     CBCPlayerIE,

+    CBCWatchVideoIE,
+    CBCWatchIE,

 )
 from .cbs import CBSIE
 from .cbslocal import CBSLocalIE
 )
 from .cbs import CBSIE
 from .cbslocal import CBSLocalIE


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

+from .cctv import CCTVIE

 from .cda import CDAIE
 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE
 from .cda import CDAIE
 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE


@@ -167,7 +187,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


@@ -179,9 +202,12 @@ 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 .ctvnews import CTVNewsIE
 from .cultureunplugged import CultureUnpluggedIE

+from .curiositystream import (
+    CuriosityStreamIE,
+    CuriosityStreamCollectionIE,
+)

 from .cwtv import CWTVIE
 from .dailymail import DailyMailIE
 from .dailymotion import (
 from .cwtv import CWTVIE
 from .dailymail import DailyMailIE
 from .dailymotion import (


@@ -197,12 +223,6 @@ from .daum import (
     DaumUserIE,
 )
 from .dbtv import DBTVIE
     DaumUserIE,
 )
 from .dbtv import DBTVIE

-from .dcn import (
-    DCNIE,
-    DCNVideoIE,
-    DCNLiveIE,
-    DCNSeasonIE,
-)

 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE


@@ -247,17 +267,25 @@ 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

-from .exfm import ExfmIE

 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE

-from .facebook import FacebookIE
+from .facebook import (
+    FacebookIE,
+    FacebookPluginsVideoIE,
+)

 from .faz import FazIE
 from .faz import FazIE

-from .fc2 import FC2IE
+from .fc2 import (
+    FC2IE,
+    FC2EmbedIE,
+)

 from .fczenit import FczenitIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fczenit import FczenitIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE


@@ -271,8 +299,13 @@ 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 .foxgay import FoxgayIE

-from .foxnews import FoxNewsIE
+from .foxnews import (
+    FoxNewsIE,
+    FoxNewsArticleIE,
+    FoxNewsInsiderIE,
+)

 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE


@@ -309,6 +342,7 @@ from .globo import (
     GloboIE,
     GloboArticleIE,
 )
     GloboIE,
     GloboArticleIE,
 )

+from .go import GoIE

 from .godtube import GodTubeIE
 from .godtv import GodTVIE
 from .golem import GolemIE
 from .godtube import GodTubeIE
 from .godtv import GodTVIE
 from .golem import GolemIE


@@ -319,7 +353,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


@@ -340,6 +377,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


@@ -372,7 +410,12 @@ from .ivi import (
     IviCompilationIE
 )
 from .ivideon import IvideonIE
     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


@@ -384,6 +427,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


@@ -402,12 +446,14 @@ from .kuwo import (
 )
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 )
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE

+from .lci import LCIIE

 from .lcp import (
     LcpPlayIE,
     LcpIE,
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE
 from .lcp import (
     LcpPlayIE,
     LcpIE,
 )
 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,


@@ -445,6 +491,10 @@ 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 .meta import METAIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .meta import METAIE


@@ -452,6 +502,7 @@ from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .mgtv import MGTVIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .mgtv import MGTVIE

+from .miaopai import MiaoPaiIE

 from .microsoftvirtualacademy import (
     MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,
 from .microsoftvirtualacademy import (
     MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,


@@ -480,9 +531,11 @@ from .motherless import MotherlessIE
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE

+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,
 )


@@ -505,6 +558,7 @@ from .nbc import (
     CSNNEIE,
     NBCIE,
     NBCNewsIE,
     CSNNEIE,
     NBCIE,
     NBCNewsIE,

+    NBCOlympicsIE,

     NBCSportsIE,
     NBCSportsVPlayerIE,
 )
     NBCSportsIE,
     NBCSportsVPlayerIE,
 )


@@ -536,6 +590,7 @@ from .nextmedia import (
 )
 from .nfb import NFBIE
 from .nfl import NFLIE
 )
 from .nfb import NFBIE
 from .nfl import NFLIE

+from .nhk import NhkVodIE

 from .nhl import (
     NHLVideocenterIE,
     NHLNewsIE,
 from .nhl import (
     NHLVideocenterIE,
     NHLNewsIE,


@@ -545,12 +600,17 @@ from .nhl import (
 from .nick import (
     NickIE,
     NickDeIE,
 from .nick import (
     NickIE,
     NickDeIE,

+    NickNightIE,

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

-from .ninecninemedia import NineCNineMediaIE
+from .ninecninemedia import (
+    NineCNineMediaStackIE,
+    NineCNineMediaIE,
+)

 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


@@ -573,13 +633,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 (


@@ -595,6 +656,7 @@ 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


@@ -615,6 +677,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


@@ -629,7 +692,6 @@ from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE

-from .played import PlayedIE

 from .playfm import PlayFMIE
 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playfm import PlayFMIE
 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE


@@ -641,7 +703,10 @@ 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 .pornhd import PornHdIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .pornhd import PornHdIE


@@ -686,6 +751,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


@@ -695,6 +764,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


@@ -734,14 +804,16 @@ from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 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 .shared import (
+    SharedIE,
+    VivoIE,
+)

 from .sharesix import ShareSixIE
 from .sina import SinaIE
 from .sixplay import SixPlayIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE
 from .sixplay import SixPlayIE


@@ -797,7 +869,6 @@ from .srgssr import (
     SRGSSRPlayIE,
 )
 from .srmediathek import SRMediathekIE
     SRGSSRPlayIE,
 )
 from .srmediathek import SRMediathekIE

-from .ssa import SSAIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamable import StreamableIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamable import StreamableIE


@@ -817,6 +888,7 @@ from .tagesschau import (
     TagesschauIE,
 )
 from .tass import TassIE
     TagesschauIE,
 )
 from .tass import TassIE

+from .tbs import TBSIE

 from .tdslifeway import TDSLifewayIE
 from .teachertube import (
     TeacherTubeIE,
 from .tdslifeway import TDSLifewayIE
 from .teachertube import (
     TeacherTubeIE,


@@ -824,6 +896,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


@@ -831,10 +904,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,


@@ -843,8 +918,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


@@ -859,16 +936,12 @@ from .tnaflix import (
     MovieFapIE,
 )
 from .toggle import ToggleIE
     MovieFapIE,
 )
 from .toggle import ToggleIE

-from .thvideo import (
-    THVideoIE,
-    THVideoPlaylistIE
-)
+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 .trutube import TruTubeIE
+from .trutv import TruTVIE

 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .tudou import (
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .tudou import (


@@ -892,12 +965,17 @@ from .tv2 import (
 )
 from .tv3 import TV3IE
 from .tv4 import TV4IE
 )
 from .tv3 import TV3IE
 from .tv4 import TV4IE

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

 from .tvc import (
     TVCIE,
     TVCArticleIE,
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 from .tvc import (
     TVCIE,
     TVCArticleIE,
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE

+from .tvnoe import TVNoeIE

 from .tvp import (
     TVPEmbedIE,
     TVPIE,
 from .tvp import (
     TVPEmbedIE,
     TVPIE,


@@ -942,6 +1020,7 @@ from .uplynk import (
 )
 from .urort import UrortIE
 from .urplay import URPlayIE
 )
 from .urort import UrortIE
 from .urplay import URPlayIE

+from .usanetwork import USANetworkIE

 from .usatoday import USATodayIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .ustudio import (
 from .usatoday import USATodayIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .ustudio import (


@@ -1029,6 +1108,8 @@ 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 .vyborymos import VyboryMosIE
+from .vzaar import VzaarIE

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


@@ -1040,6 +1121,10 @@ from .wdr import (
     WDRIE,
     WDRMobileIE,
 )
     WDRIE,
     WDRMobileIE,
 )

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

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


@@ -1115,7 +1200,4 @@ from .youtube import (
 )
 from .zapiks import ZapiksIE
 from .zdf import ZDFIE, ZDFChannelIE
 )
 from .zapiks import ZapiksIE
 from .zdf import ZDFIE, ZDFChannelIE

-from .zingmp3 import (
-    ZingMp3SongIE,
-    ZingMp3AlbumIE,
-)
+from .zingmp3 import ZingMp3IE