Merge branch 'polskie-radio-programme' of https://github.com/JakubAdamWieczorek/youtu...

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 9b8e1ab2595fd1913edb18dc0473ccabe8c674b9..6a142996f03e7b49296eccabf3db8e1c0a4cf849 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1,8 +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 .abcotvs import (
+    ABCOTVSIE,
+    ABCOTVSClipsIE,
+)

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


@@ -16,11 +26,16 @@ from .adobetv import (
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

-from .aenetworks import AENetworksIE
+from .aenetworks import (
+    AENetworksIE,
+    HistoryTopicIE,
+)
+from .afreecatv import AfreecaTVIE

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

+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


@@ -36,10 +51,10 @@ from .appletrailers import (
     AppleTrailersSectionIE,
 )
 from .archiveorg import ArchiveOrgIE
     AppleTrailersSectionIE,
 )
 from .archiveorg import ArchiveOrgIE

+from .arkena import ArkenaIE

 from .ard import (
     ARDIE,
     ARDMediathekIE,
 from .ard import (
     ARDIE,
     ARDMediathekIE,

-    SportschauIE,

 )
 from .arte import (
     ArteTvIE,
 )
 from .arte import (
     ArteTvIE,


@@ -52,12 +67,19 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,

+    ArteTVPlaylistIE,

 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .audimedia import AudiMediaIE
 from .audioboom import AudioBoomIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 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


@@ -65,6 +87,8 @@ from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,

+    BBCCoUkIPlayerPlaylistIE,
+    BBCCoUkPlaylistIE,

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


@@ -75,6 +99,7 @@ from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .biobiochiletv import BioBioChileTVIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .biobiochiletv import BioBioChileTVIE

+from .biqle import BIQLEIE

 from .bleacherreport import (
     BleacherReportIE,
     BleacherReportCMSIE,
 from .bleacherreport import (
     BleacherReportIE,
     BleacherReportCMSIE,


@@ -101,11 +126,19 @@ from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import CanvasIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import CanvasIE

+from .carambatv import (
+    CarambaTVIE,
+    CarambaTVPageIE,
+)
+from .cartoonnetwork import CartoonNetworkIE

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

+    CBCWatchVideoIE,
+    CBCWatchIE,

 )
 from .cbs import CBSIE
 )
 from .cbs import CBSIE

+from .cbslocal import CBSLocalIE

 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
     CBSNewsIE,
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
     CBSNewsIE,


@@ -113,9 +146,11 @@ 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

+from .charlierose import CharlieRoseIE

 from .chaturbate import ChaturbateIE
 from .chilloutzone import ChilloutzoneIE
 from .chirbit import (
 from .chaturbate import ChaturbateIE
 from .chilloutzone import ChilloutzoneIE
 from .chirbit import (


@@ -123,11 +158,11 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

-from .cinemassacre import CinemassacreIE
-from .cliprs import ClipRsIE

 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE

+from .cliprs import ClipRsIE

 from .clipsyndicate import ClipsyndicateIE
 from .clipsyndicate import ClipsyndicateIE

+from .closertotruth import CloserToTruthIE

 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE


@@ -138,9 +173,14 @@ from .cnn import (
     CNNBlogsIE,
     CNNArticleIE,
 )
     CNNBlogsIE,
     CNNArticleIE,
 )

-from .collegehumor import CollegeHumorIE
+from .coub import CoubIE

 from .collegerama import CollegeRamaIE
 from .collegerama import CollegeRamaIE

-from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
+from .comedycentral import (
+    ComedyCentralIE,
+    ComedyCentralShortnameIE,
+    ComedyCentralTVIE,
+    ToshIE,
+)

 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .commonprotocols import RtmpIE
 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .commonprotocols import RtmpIE


@@ -155,8 +195,15 @@ 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 .cultureunplugged import CultureUnpluggedIE

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

 from .cwtv import CWTVIE
 from .cwtv import CWTVIE

+from .dailymail import DailyMailIE

 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,


@@ -170,12 +217,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


@@ -193,10 +234,11 @@ from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .drtv import DRTVIE
 from .dvtv import DVTVIE
 from .drtuber import DrTuberIE
 from .drtv import DRTVIE
 from .dvtv import DVTVIE

-from .dump import DumpIE

 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE

+from .discoverygo import DiscoveryGoIE
+from .dispeak import DigitallySpeakingIE

 from .dropbox import DropboxIE
 from .dw import (
     DWIE,
 from .dropbox import DropboxIE
 from .dw import (
     DWIE,


@@ -223,12 +265,18 @@ from .espn import ESPNIE
 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 .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE

-from .facebook import FacebookIE
+from .eyedotv import EyedoTVIE
+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


@@ -236,17 +284,19 @@ from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .fktv import FKTVIE
 from .flickr import FlickrIE
 from .fivetv import FiveTVIE
 from .fktv import FKTVIE
 from .flickr import FlickrIE

+from .flipagram import FlipagramIE

 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE

+from .formula1 import Formula1IE

 from .fourtube import FourTubeIE
 from .fox import FOXIE
 from .foxgay import FoxgayIE
 from .fourtube import FourTubeIE
 from .fox import FOXIE
 from .foxgay import FoxgayIE

-from .foxnews import FoxNewsIE
-from .foxsports import FoxSportsIE
-from .franceculture import (
-    FranceCultureIE,
-    FranceCultureEmissionIE,
+from .foxnews import (
+    FoxNewsIE,
+    FoxNewsInsiderIE,

 )
 )

+from .foxsports import FoxSportsIE
+from .franceculture import FranceCultureIE

 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,
 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,


@@ -260,8 +310,9 @@ from .freespeech import FreespeechIE
 from .freevideo import FreeVideoIE
 from .funimation import FunimationIE
 from .funnyordie import FunnyOrDieIE
 from .freevideo import FreeVideoIE
 from .funimation import FunimationIE
 from .funnyordie import FunnyOrDieIE

+from .fusion import FusionIE
+from .fxnetworks import FXNetworksIE

 from .gameinformer import GameInformerIE
 from .gameinformer import GameInformerIE

-from .gamekings import GamekingsIE

 from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,
 from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,


@@ -269,7 +320,6 @@ from .gameone import (
 from .gamersyde import GamersydeIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gamersyde import GamersydeIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE

-from .gametrailers import GametrailersIE

 from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE
 from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE


@@ -281,8 +331,9 @@ from .globo import (
     GloboIE,
     GloboArticleIE,
 )
     GloboIE,
     GloboArticleIE,
 )

+from .go import GoIE

 from .godtube import GodTubeIE
 from .godtube import GodTubeIE

-from .goldenmoustache import GoldenMoustacheIE
+from .godtv import GodTVIE

 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .googleplus import GooglePlusIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .googleplus import GooglePlusIE


@@ -297,6 +348,10 @@ from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE

+from .hgtv import (
+    HGTVIE,
+    HGTVComShowIE,
+)

 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE


@@ -304,6 +359,10 @@ from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import HotStarIE
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .hotstar import HotStarIE
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE

+from .hrti import (
+    HRTiIE,
+    HRTiPlaylistIE,
+)

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


@@ -342,11 +401,13 @@ from .jove import JoveIE
 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE
 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE

+from .kamcord import KamcordIE

 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .karrierevideos import KarriereVideosIE
 from .keezmovies import KeezMoviesIE
 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 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


@@ -365,6 +426,12 @@ 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 .lemonde import LemondeIE
 from .leeco import (
 from .lecture2go import Lecture2GoIE
 from .lemonde import LemondeIE
 from .leeco import (


@@ -372,6 +439,7 @@ from .leeco import (
     LePlaylistIE,
     LetvCloudIE,
 )
     LePlaylistIE,
     LetvCloudIE,
 )

+from .libraryofcongress import LibraryOfCongressIE

 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,
 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,


@@ -382,6 +450,7 @@ from .limelight import (
     LimelightChannelIE,
     LimelightChannelListIE,
 )
     LimelightChannelIE,
     LimelightChannelListIE,
 )

+from .litv import LiTVIE

 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,
 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,


@@ -389,6 +458,7 @@ from .livestream import (
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE

+from .localnews8 import LocalNews8IE

 from .lovehomeporn import LoveHomePornIE
 from .lrt import LRTIE
 from .lynda import (
 from .lovehomeporn import LoveHomePornIE
 from .lrt import LRTIE
 from .lynda import (


@@ -400,12 +470,18 @@ 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 .malemotion import MalemotionIE

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

+from .meta import METAIE

 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE

+from .mgtv import MGTVIE
+from .miaopai import MiaoPaiIE
+from .microsoftvirtualacademy import (
+    MicrosoftVirtualAcademyIE,
+    MicrosoftVirtualAcademyCourseIE,
+)

 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE


@@ -430,24 +506,25 @@ 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,
     MTVServicesEmbeddedIE,
 from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,

-    MTVIggyIE,

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

-from .muzu import MuzuTVIE
-from .mwave import MwaveIE
+from .mwave import MwaveIE, MwaveMeetGreetIE

 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvi import MyviIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvi import MyviIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (

+    NationalGeographicVideoIE,

     NationalGeographicIE,
     NationalGeographicIE,

-    NationalGeographicChannelIE,
+    NationalGeographicEpisodeGuideIE,

 )
 from .naver import NaverIE
 from .nba import NBAIE
 )
 from .naver import NaverIE
 from .nba import NBAIE


@@ -457,7 +534,6 @@ from .nbc import (
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,

-    MSNBCIE,

 )
 from .ndr import (
     NDRIE,
 )
 from .ndr import (
     NDRIE,


@@ -485,17 +561,27 @@ from .nextmedia import (
     NextMediaActionNewsIE,
     AppleDailyIE,
 )
     NextMediaActionNewsIE,
     AppleDailyIE,
 )

-from .nextmovie import NextMovieIE

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

+from .nhk import NhkVodIE

 from .nhl import (
 from .nhl import (

-    NHLIE,
-    NHLNewsIE,

     NHLVideocenterIE,
     NHLVideocenterIE,

+    NHLNewsIE,
+    NHLVideocenterCategoryIE,
+    NHLIE,
+)
+from .nick import (
+    NickIE,
+    NickDeIE,

 )
 )

-from .nick import NickIE

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

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

 from .ninegag import NineGagIE
 from .ninegag import NineGagIE

+from .ninenow import NineNowIE
+from .nintendo import NintendoIE

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


@@ -540,8 +626,13 @@ from .nytimes import (
     NYTimesArticleIE,
 )
 from .nuvid import NuvidIE
     NYTimesArticleIE,
 )
 from .nuvid import NuvidIE

+from .odatv import OdaTVIE

 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE

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

 from .onionstudios import OnionStudiosIE
 from .ooyala import (
     OoyalaIE,
 from .onionstudios import OnionStudiosIE
 from .ooyala import (
     OoyalaIE,


@@ -560,14 +651,15 @@ from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .people import PeopleIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .people import PeopleIE

-from .periscope import PeriscopeIE
+from .periscope import (
+    PeriscopeIE,
+    PeriscopeUserIE,
+)

 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE

-from .planetaplay import PlanetaPlayIE

 from .pladform import PladformIE
 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


@@ -578,7 +670,10 @@ from .pluralsight import (
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE

+from .pokemon import PokemonIE
+from .polskieradio import PolskieRadioIE, PolskieRadioProgrammeIE

 from .porn91 import Porn91IE
 from .porn91 import Porn91IE

+from .porncom import PornComIE

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


@@ -601,8 +696,14 @@ from .qqmusic import (
     QQMusicToplistIE,
     QQMusicPlaylistIE,
 )
     QQMusicToplistIE,
     QQMusicPlaylistIE,
 )

-from .quickvid import QuickVidIE
-from .r7 import R7IE
+from .r7 import (
+    R7IE,
+    R7ArticleIE,
+)
+from .radiocanada import (
+    RadioCanadaIE,
+    RadioCanadaAudioVideoIE,
+)

 from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE


@@ -616,21 +717,30 @@ from .rds import RDSIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .restudy import RestudyIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .restudy import RestudyIE

+from .reuters import ReutersIE

 from .reverbnation import ReverbNationIE
 from .reverbnation import ReverbNationIE

-from .revision3 import Revision3IE
+from .revision3 import (
+    Revision3EmbedIE,
+    Revision3IE,
+)

 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 .ro220 import Ro220IE

+from .rockstargames import RockstarGamesIE
+from .roosterteeth import RoosterTeethIE

 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE

+from .rozhlas import RozhlasIE

 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE

-from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
+from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE

 from .rtvnh import RTVNHIE
 from .rtvnh import RTVNHIE

+from .rudo import RudoIE

 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE
 from .rutube import (
 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE
 from .rutube import (


@@ -656,18 +766,21 @@ from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE

+from .seeker import SeekerIE

 from .senateisvp import SenateISVPIE
 from .senateisvp import SenateISVPIE

+from .sendtonews import SendtoNewsIE

 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE

-from .sexykarma import SexyKarmaIE

 from .shahid import ShahidIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE
 from .shahid import ShahidIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE

+from .sixplay import SixPlayIE

 from .skynewsarabia import (
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )
 from .skynewsarabia import (
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )

+from .skysports import SkySportsIE

 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .smotri import (
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .smotri import (


@@ -676,12 +789,9 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

-from .snagfilms import (
-    SnagFilmsIE,
-    SnagFilmsEmbedIE,
-)

 from .snotr import SnotrIE
 from .sohu import SohuIE
 from .snotr import SnotrIE
 from .sohu import SohuIE

+from .sonyliv import SonyLIVIE

 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,


@@ -712,14 +822,15 @@ from .sportbox import (
     SportBoxEmbedIE,
 )
 from .sportdeutschland import SportDeutschlandIE
     SportBoxEmbedIE,
 )
 from .sportdeutschland import SportDeutschlandIE

+from .sportschau import SportschauIE

 from .srgssr import (
     SRGSSRIE,
     SRGSSRPlayIE,
 )
 from .srmediathek import SRMediathekIE
 from .srgssr import (
     SRGSSRIE,
     SRGSSRPlayIE,
 )
 from .srmediathek import SRMediathekIE

-from .ssa import SSAIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE

+from .streamable import StreamableIE

 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE


@@ -731,9 +842,12 @@ from .svt import (
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE

-from .tagesschau import TagesschauIE
-from .tapely import TapelyIE
+from .tagesschau import (
+    TagesschauPlayerIE,
+    TagesschauIE,
+)

 from .tass import TassIE
 from .tass import TassIE

+from .tbs import TBSIE

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


@@ -748,7 +862,9 @@ 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 .teletask import TeleTaskIE

+from .telewebion import TelewebionIE

 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE


@@ -761,6 +877,7 @@ from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thestar import TheStarIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE

+from .threeqsdn import ThreeQSDNIE

 from .tinypic import TinyPicIE
 from .tlc import TlcDeIE
 from .tmz import (
 from .tinypic import TinyPicIE
 from .tlc import TlcDeIE
 from .tmz import (


@@ -774,16 +891,12 @@ from .tnaflix import (
     MovieFapIE,
 )
 from .toggle import ToggleIE
     MovieFapIE,
 )
 from .toggle import ToggleIE

-from .thvideo import (
-    THVideoIE,
-    THVideoPlaylistIE
-)

 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .trollvids import TrollvidsIE
 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 (


@@ -813,8 +926,16 @@ from .tvc import (
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE

-from .tvp import TvpIE, TvpSeriesIE
-from .tvplay import TVPlayIE
+from .tvnoe import TVNoeIE
+from .tvp import (
+    TVPEmbedIE,
+    TVPIE,
+    TVPSeriesIE,
+)
+from .tvplay import (
+    TVPlayIE,
+    ViafreeIE,
+)

 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE


@@ -828,8 +949,8 @@ from .twitch import (
     TwitchVodIE,
     TwitchProfileIE,
     TwitchPastBroadcastsIE,
     TwitchVodIE,
     TwitchProfileIE,
     TwitchPastBroadcastsIE,

-    TwitchBookmarksIE,

     TwitchStreamIE,
     TwitchStreamIE,

+    TwitchClipsIE,

 )
 from .twitter import (
     TwitterCardIE,
 )
 from .twitter import (
     TwitterCardIE,


@@ -843,17 +964,30 @@ from .udemy import (
 from .udn import UDNEmbedIE
 from .digiteka import DigitekaIE
 from .unistra import UnistraIE
 from .udn import UDNEmbedIE
 from .digiteka import DigitekaIE
 from .unistra import UnistraIE

+from .uol import UOLIE
+from .uplynk import (
+    UplynkIE,
+    UplynkPreplayIE,
+)

 from .urort import UrortIE
 from .urort import UrortIE

+from .urplay import URPlayIE
+from .usanetwork import USANetworkIE

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

-from .ustudio import UstudioIE
+from .ustudio import (
+    UstudioIE,
+    UstudioEmbedIE,
+)

 from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .vessel import VesselIE
 from .vesti import VestiIE
 from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .vessel import VesselIE
 from .vesti import VestiIE

-from .vevo import VevoIE
+from .vevo import (
+    VevoIE,
+    VevoPlaylistIE,
+)

 from .vgtv import (
     BTArticleIE,
     BTVestlendingenIE,
 from .vgtv import (
     BTArticleIE,
     BTVestlendingenIE,


@@ -864,6 +998,8 @@ from .vice import (
     ViceIE,
     ViceShowIE,
 )
     ViceIE,
     ViceShowIE,
 )

+from .viceland import VicelandIE
+from .vidbit import VidbitIE

 from .viddler import ViddlerIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .viddler import ViddlerIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE


@@ -875,6 +1011,7 @@ from .videomore import (
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE

+from .vidio import VidioIE

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


@@ -882,6 +1019,10 @@ from .vidme import (
 )
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 )
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE

+from .viewlift import (
+    ViewLiftIE,
+    ViewLiftEmbedIE,
+)

 from .viewster import ViewsterIE
 from .viidea import ViideaIE
 from .vimeo import (
 from .viewster import ViewsterIE
 from .viidea import ViideaIE
 from .vimeo import (


@@ -907,34 +1048,40 @@ from .viki import (
 from .vk import (
     VKIE,
     VKUserVideosIE,
 from .vk import (
     VKIE,
     VKUserVideosIE,

+    VKWallPostIE,

 )
 from .vlive import VLiveIE
 from .vodlocker import VodlockerIE
 )
 from .vlive import VLiveIE
 from .vodlocker import VodlockerIE

+from .vodplatform import VODPlatformIE

 from .voicerepublic import VoiceRepublicIE
 from .voxmedia import VoxMediaIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .voicerepublic import VoiceRepublicIE
 from .voxmedia import VoxMediaIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE

-from .vulture import VultureIE

 from .walla import WallaIE
 from .walla import WallaIE

-from .washingtonpost import WashingtonPostIE
+from .washingtonpost import (
+    WashingtonPostIE,
+    WashingtonPostArticleIE,
+)

 from .wat import WatIE
 from .wat import WatIE

+from .watchindianporn import WatchIndianPornIE

 from .wdr import (
     WDRIE,
     WDRMobileIE,
 from .wdr import (
     WDRIE,
     WDRMobileIE,

-    WDRMausIE,

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

-from .weibo import WeiboIE

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

-from .wrzuta import WrzutaIE
+from .wrzuta import (
+    WrzutaIE,
+    WrzutaPlaylistIE,
+)

 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE


@@ -943,6 +1090,12 @@ from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 )
     XHamsterIE,
     XHamsterEmbedIE,
 )

+from .xiami import (
+    XiamiSongIE,
+    XiamiAlbumIE,
+    XiamiArtistIE,
+    XiamiCollectionIE
+)

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


@@ -964,7 +1117,10 @@ from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE

-from .youku import YoukuIE
+from .youku import (
+    YoukuIE,
+    YoukuShowIE,
+)

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


@@ -979,6 +1135,7 @@ from .youtube import (
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,

+    YoutubeSharedVideoIE,

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


@@ -988,8 +1145,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 .zippcast import ZippCastIE
+from .zingmp3 import ZingMp3IE