d/p/remove-autoupdate-mechanism.patch: Update patch with metadata at the top.

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 4232a4fefd9973070525c83b8c3d51c47f1eea26..3bde40eb3cef5ad6c9a22ad894de334e03ea0ce2 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -31,10 +31,7 @@ from .aenetworks import (
     AENetworksIE,
     HistoryTopicIE,
 )
     AENetworksIE,
     HistoryTopicIE,
 )

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

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


@@ -130,7 +127,10 @@ from .bloomberg import BloombergIE
 from .bokecc import BokeCCIE
 from .bostonglobe import BostonGlobeIE
 from .bpb import BpbIE
 from .bokecc import BokeCCIE
 from .bostonglobe import BostonGlobeIE
 from .bpb import BpbIE

-from .br import BRIE
+from .br import (
+    BRIE,
+    BRMediathekIE,
+)

 from .bravotv import BravoTVIE
 from .breakcom import BreakIE
 from .brightcove import (
 from .bravotv import BravoTVIE
 from .breakcom import BreakIE
 from .brightcove import (


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

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

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


@@ -150,7 +147,11 @@ from .camdemy import (
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

-from .canvas import CanvasIE
+from .canvas import (
+    CanvasIE,
+    CanvasEenIE,
+    VrtNUIE,
+)

 from .carambatv import (
     CarambaTVIE,
     CarambaTVPageIE,
 from .carambatv import (
     CarambaTVIE,
     CarambaTVPageIE,


@@ -161,6 +162,7 @@ from .cbc import (
     CBCPlayerIE,
     CBCWatchVideoIE,
     CBCWatchIE,
     CBCPlayerIE,
     CBCWatchVideoIE,
     CBCWatchIE,

+    CBCOlympicsIE,

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


@@ -204,7 +206,6 @@ from .cnn import (
     CNNArticleIE,
 )
 from .coub import CoubIE
     CNNArticleIE,
 )
 from .coub import CoubIE

-from .collegerama import CollegeRamaIE

 from .comedycentral import (
     ComedyCentralFullEpisodesIE,
     ComedyCentralIE,
 from .comedycentral import (
     ComedyCentralFullEpisodesIE,
     ComedyCentralIE,


@@ -242,11 +243,10 @@ from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,

-    DailymotionCloudIE,

 )
 from .daisuki import (
 )
 from .daisuki import (

-    DaisukiIE,
-    DaisukiPlaylistIE,
+    DaisukiMottoIE,
+    DaisukiMottoPlaylistIE,

 )
 from .daum import (
     DaumIE,
 )
 from .daum import (
     DaumIE,


@@ -260,6 +260,7 @@ from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE

+from .digg import DiggIE

 from .dotsub import DotsubIE
 from .douyutv import (
     DouyuShowIE,
 from .dotsub import DotsubIE
 from .douyutv import (
     DouyuShowIE,


@@ -308,9 +309,10 @@ from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .eitb import EitbIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .eitb import EitbIE

-from .ellentv import (
-    EllenTVIE,
-    EllenTVClipsIE,
+from .ellentube import (
+    EllenTubeIE,
+    EllenTubeVideoIE,
+    EllenTubePlaylistIE,

 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE
 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE


@@ -321,6 +323,7 @@ from .escapist import EscapistIE
 from .espn import (
     ESPNIE,
     ESPNArticleIE,
 from .espn import (
     ESPNIE,
     ESPNArticleIE,

+    FiveThirtyEightIE,

 )
 from .esri import EsriVideoIE
 from .etonline import ETOnlineIE
 )
 from .esri import EsriVideoIE
 from .etonline import ETOnlineIE


@@ -343,11 +346,10 @@ from .filmon import (
     FilmOnIE,
     FilmOnChannelIE,
 )
     FilmOnIE,
     FilmOnChannelIE,
 )

-from .firstpost import FirstpostIE
+from .filmweb import FilmwebIE

 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE

-from .fktv import FKTVIE

 from .flickr import FlickrIE
 from .flipagram import FlipagramIE
 from .folketinget import FolketingetIE
 from .flickr import FlickrIE
 from .flipagram import FlipagramIE
 from .folketinget import FolketingetIE


@@ -372,15 +374,21 @@ from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,

+    FranceTVSiteIE,

     FranceTVEmbedIE,
     FranceTVInfoIE,
     FranceTVEmbedIE,
     FranceTVInfoIE,

-    GenerationQuoiIE,
+    FranceTVJeunesseIE,
+    GenerationWhatIE,

     CultureboxIE,
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .funimation import FunimationIE
     CultureboxIE,
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .funimation import FunimationIE

+from .funk import (
+    FunkMixIE,
+    FunkChannelIE,
+)

 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE


@@ -389,7 +397,6 @@ from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,
 )
     GameOneIE,
     GameOnePlaylistIE,
 )

-from .gamersyde import GamersydeIE

 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE


@@ -425,12 +432,16 @@ from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hgtv import HGTVComShowIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hgtv import HGTVComShowIE

+from .hidive import HiDiveIE

 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hitrecord import HitRecordIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 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 .hotstar import (
+    HotStarIE,
+    HotStarPlaylistIE,
+)

 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .hrti import (
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .hrti import (


@@ -462,6 +473,7 @@ from .indavideo import (
 )
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 )
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE

+from .internazionale import InternazionaleIE

 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE


@@ -485,7 +497,6 @@ from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE
 from .jpopsukitv import JpopsukiIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE

-from .kamcord import KamcordIE

 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE


@@ -539,6 +550,7 @@ from .limelight import (
     LimelightChannelIE,
     LimelightChannelListIE,
 )
     LimelightChannelIE,
     LimelightChannelListIE,
 )

+from .line import LineTVIE

 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,
 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,


@@ -559,7 +571,11 @@ from .lynda import (
 )
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE
 )
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE

-from .mailru import MailRuIE
+from .mailru import (
+    MailRuIE,
+    MailRuMusicIE,
+    MailRuMusicSearchIE,
+)

 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE
 from .mangomolo import (
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE
 from .mangomolo import (


@@ -567,9 +583,11 @@ from .mangomolo import (
     MangomoloLiveIE,
 )
 from .manyvids import ManyVidsIE
     MangomoloLiveIE,
 )
 from .manyvids import ManyVidsIE

+from .massengeschmacktv import MassengeschmackTVIE

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE

+from .mediasite import MediasiteIE

 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE


@@ -603,7 +621,10 @@ from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moniker import MonikerIE
 from .morningstar import MorningstarIE
 from .mojvideo import MojvideoIE
 from .moniker import MonikerIE
 from .morningstar import MorningstarIE

-from .motherless import MotherlessIE
+from .motherless import (
+    MotherlessIE,
+    MotherlessGroupIE
+)

 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE


@@ -621,8 +642,10 @@ from .musicplayon import MusicPlayOnIE
 from .mwave import MwaveIE, MwaveMeetGreetIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .mwave import MwaveIE, MwaveMeetGreetIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE

-from .myvi import MyviIE
-from .myvideo import MyVideoIE
+from .myvi import (
+    MyviIE,
+    MyviEmbedIE,
+)

 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,


@@ -636,6 +659,7 @@ from .nbc import (
     NBCIE,
     NBCNewsIE,
     NBCOlympicsIE,
     NBCIE,
     NBCNewsIE,
     NBCOlympicsIE,

+    NBCOlympicsStreamIE,

     NBCSportsIE,
     NBCSportsVPlayerIE,
 )
     NBCSportsIE,
     NBCSportsVPlayerIE,
 )


@@ -684,6 +708,7 @@ from .nhl import (
 )
 from .nick import (
     NickIE,
 )
 from .nick import (
     NickIE,

+    NickBrIE,

     NickDeIE,
     NickNightIE,
     NickRuIE,
     NickDeIE,
     NickNightIE,
     NickRuIE,


@@ -716,10 +741,6 @@ from .nowness import (
     NownessPlaylistIE,
     NownessSeriesIE,
 )
     NownessPlaylistIE,
     NownessSeriesIE,
 )

-from .nowtv import (
-    NowTVIE,
-    NowTVListIE,
-)

 from .noz import NozIE
 from .npo import (
     AndereTijdenIE,
 from .noz import NozIE
 from .npo import (
     AndereTijdenIE,


@@ -785,6 +806,7 @@ from .patreon import PatreonIE
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE
 from .people import PeopleIE
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE
 from .people import PeopleIE

+from .performgroup import PerformGroupIE

 from .periscope import (
     PeriscopeIE,
     PeriscopeUserIE,
 from .periscope import (
     PeriscopeIE,
     PeriscopeUserIE,


@@ -851,8 +873,10 @@ from .radiofrance import RadioFranceIE
 from .rai import (
     RaiPlayIE,
     RaiPlayLiveIE,
 from .rai import (
     RaiPlayIE,
     RaiPlayLiveIE,

+    RaiPlayPlaylistIE,

     RaiIE,
 )
     RaiIE,
 )

+from .raywenderlich import RayWenderlichIE

 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE


@@ -874,7 +898,6 @@ from .revision3 import (
     Revision3IE,
 )
 from .rice import RICEIE
     Revision3IE,
 )
 from .rice import RICEIE

-from .ringtv import RingTVIE

 from .rmcdecouverte import RMCDecouverteIE
 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE
 from .rmcdecouverte import RMCDecouverteIE
 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE


@@ -894,6 +917,7 @@ from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE

+from .rtvs import RTVSIE

 from .rudo import RudoIE
 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE
 from .rudo import RudoIE
 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE


@@ -908,7 +932,6 @@ from .rutube import (
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import RuvIE
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import RuvIE

-from .sandia import SandiaIE

 from .safari import (
     SafariIE,
     SafariApiIE,
 from .safari import (
     SafariIE,
     SafariApiIE,


@@ -924,8 +947,17 @@ from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE

+from .servus import ServusIE
+from .sevenplus import SevenPlusIE

 from .sexu import SexuIE
 from .sexu import SexuIE

-from .shahid import ShahidIE
+from .seznamzpravy import (
+    SeznamZpravyIE,
+    SeznamZpravyArticleIE,
+)
+from .shahid import (
+    ShahidIE,
+    ShahidShowIE,
+)

 from .shared import (
     SharedIE,
     VivoIE,
 from .shared import (
     SharedIE,
     VivoIE,


@@ -940,6 +972,7 @@ from .skynewsarabia import (
 )
 from .skysports import SkySportsIE
 from .slideshare import SlideshareIE
 )
 from .skysports import SkySportsIE
 from .slideshare import SlideshareIE

+from .slideslive import SlidesLiveIE

 from .slutload import SlutloadIE
 from .smotri import (
     SmotriIE,
 from .slutload import SlutloadIE
 from .smotri import (
     SmotriIE,


@@ -978,7 +1011,7 @@ from .stitcher import StitcherIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxEmbedIE
 from .sportdeutschland import SportDeutschlandIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxEmbedIE
 from .sportdeutschland import SportDeutschlandIE

-from .sportschau import SportschauIE
+from .springboardplatform import SpringboardPlatformIE

 from .sprout import SproutIE
 from .srgssr import (
     SRGSSRIE,
 from .sprout import SproutIE
 from .srgssr import (
     SRGSSRIE,


@@ -992,6 +1025,7 @@ from .streamango import StreamangoIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE

+from .stretchinternet import StretchInternetIE

 from .sunporno import SunPornoIE
 from .svt import (
     SVTIE,
 from .sunporno import SunPornoIE
 from .svt import (
     SVTIE,


@@ -1021,9 +1055,14 @@ 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 .telequebec import (
+    TeleQuebecIE,
+    TeleQuebecEmissionIE,
+    TeleQuebecLiveIE,
+)

 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE

+from .tennistv import TennisTVIE

 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .tfo import TFOIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .tfo import TFOIE


@@ -1033,7 +1072,6 @@ from .theplatform import (
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE

-from .thesixtyone import TheSixtyOneIE

 from .thestar import TheStarIE
 from .thesun import TheSunIE
 from .theweatherchannel import TheWeatherChannelIE
 from .thestar import TheStarIE
 from .thesun import TheSunIE
 from .theweatherchannel import TheWeatherChannelIE


@@ -1094,6 +1132,10 @@ from .tvigle import TvigleIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE
 from .tvnoe import TVNoeIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE
 from .tvnoe import TVNoeIE

+from .tvnow import (
+    TVNowIE,
+    TVNowListIE,
+)

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


@@ -1107,10 +1149,7 @@ from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE

-from .twentytwotracks import (
-    TwentyTwoTracksIE,
-    TwentyTwoTracksGenreIE
-)
+from .twentythreevideo import TwentyThreeVideoIE

 from .twitch import (
     TwitchVideoIE,
     TwitchChapterIE,
 from .twitch import (
     TwitchVideoIE,
     TwitchChapterIE,


@@ -1133,9 +1172,12 @@ from .udemy import (
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

+from .ufctv import UFCTVIE

 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE
 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE

+from .umg import UMGDeIE

 from .unistra import UnistraIE
 from .unistra import UnistraIE

+from .unity import UnityIE

 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,
 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,


@@ -1175,7 +1217,6 @@ from .vice import (
     ViceArticleIE,
     ViceShowIE,
 )
     ViceArticleIE,
     ViceShowIE,
 )

-from .viceland import VicelandIE

 from .vidbit import VidbitIE
 from .viddler import ViddlerIE
 from .videa import VideaIE
 from .vidbit import VidbitIE
 from .viddler import ViddlerIE
 from .videa import VideaIE


@@ -1190,6 +1231,7 @@ from .videomore import (
 from .videopremium import VideoPremiumIE
 from .videopress import VideoPressIE
 from .vidio import VidioIE
 from .videopremium import VideoPremiumIE
 from .videopress import VideoPressIE
 from .vidio import VidioIE

+from .vidlii import VidLiiIE

 from .vidme import (
     VidmeIE,
     VidmeUserIE,
 from .vidme import (
     VidmeIE,
     VidmeUserIE,


@@ -1243,7 +1285,10 @@ from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE
 from .voot import VootIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE
 from .voot import VootIE

-from .voxmedia import VoxMediaIE
+from .voxmedia import (
+    VoxMediaVolumeIE,
+    VoxMediaIE,
+)

 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vrak import VrakIE


@@ -1268,6 +1313,8 @@ from .watchbox import WatchBoxIE
 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,

+    WDRPageIE,
+    WDRElefantIE,

     WDRMobileIE,
 )
 from .webcaster import (
     WDRMobileIE,
 )
 from .webcaster import (


@@ -1278,6 +1325,10 @@ from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )

+from .weibo import (
+    WeiboIE, 
+    WeiboMobileIE
+)

 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE


@@ -1303,6 +1354,10 @@ from .xiami import (
     XiamiArtistIE,
     XiamiCollectionIE
 )
     XiamiArtistIE,
     XiamiCollectionIE
 )

+from .ximalaya import (
+    XimalayaIE,
+    XimalayaAlbumIE
+)

 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE
 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE


@@ -1320,6 +1375,7 @@ from .yandexmusic import (
     YandexMusicPlaylistIE,
 )
 from .yandexdisk import YandexDiskIE
     YandexMusicPlaylistIE,
 )
 from .yandexdisk import YandexDiskIE

+from .yapfiles import YapFilesIE

 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE


@@ -1328,6 +1384,11 @@ from .youku import (
     YoukuIE,
     YoukuShowIE,
 )
     YoukuIE,
     YoukuShowIE,
 )

+from .younow import (
+    YouNowLiveIE,
+    YouNowChannelIE,
+    YouNowMomentIE,
+)

 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (
 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (


@@ -1342,7 +1403,6 @@ from .youtube import (
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,

-    YoutubeSharedVideoIE,

     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,