Merge tag 'upstream/2015.05.15'

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 7497a97f5c7ece071b0ddc5427dc3ed746d1421d..8ec0c1032a1538f87a17a66e4211deb2db88418d 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,8 +1,16 @@
+from __future__ import unicode_literals
+

 from .abc import ABCIE
 from .abc import ABCIE

+from .abc7news import Abc7NewsIE

 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE

+from .adobetv import AdobeTVIE

 from .adultswim import AdultSwimIE
 from .adultswim import AdultSwimIE

+from .aftenposten import AftenpostenIE

 from .aftonbladet import AftonbladetIE
 from .aftonbladet import AftonbladetIE

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

 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE


@@ -20,31 +28,49 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )

-from .audiomack import AudiomackIE
-from .auengine import AUEngineIE
+from .atresplayer import AtresPlayerIE
+from .atttechchannel import ATTTechChannelIE
+from .audiomack import AudiomackIE, AudiomackAlbumIE
+from .azubu import AzubuIE
+from .baidu import BaiduVideoIE

 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE

+from .beatportpro import BeatportProIE
+from .bet import BetIE

 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE

+from .bpb import BpbIE

 from .br import BRIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE

+from .buzzfeed import BuzzFeedIE

 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .byutv import BYUtvIE
 from .c56 import C56IE

+from .camdemy import (
+    CamdemyIE,
+    CamdemyFolderIE
+)

 from .canal13cl import Canal13clIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE
 from .cbsnews import CBSNewsIE
 from .canal13cl import Canal13clIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE
 from .cbsnews import CBSNewsIE

+from .cbssports import CBSSportsIE
+from .ccc import CCCIE

 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE
 from .chilloutzone import ChilloutzoneIE
 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE
 from .chilloutzone import ChilloutzoneIE

+from .chirbit import (
+    ChirbitIE,
+    ChirbitProfileIE,
+)
+from .cinchcast import CinchcastIE

 from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE


@@ -56,17 +82,23 @@ from .cnet import CNETIE
 from .cnn import (
     CNNIE,
     CNNBlogsIE,
 from .cnn import (
     CNNIE,
     CNNBlogsIE,

+    CNNArticleIE,

 )
 from .collegehumor import CollegeHumorIE
 )
 from .collegehumor import CollegeHumorIE

+from .collegerama import CollegeRamaIE

 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE

+from .comcarcoff import ComCarCoffIE
+from .commonmistakes import CommonMistakesIE, UnicodeBOMIE

 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .criterion import CriterionIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .criterion import CriterionIE

+from .crooksandliars import CrooksAndLiarsIE

 from .crunchyroll import (
     CrunchyrollIE,
     CrunchyrollShowPlaylistIE
 )
 from .cspan import CSpanIE
 from .crunchyroll import (
     CrunchyrollIE,
     CrunchyrollShowPlaylistIE
 )
 from .cspan import CSpanIE

+from .ctsnews import CtsNewsIE

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


@@ -74,18 +106,26 @@ from .dailymotion import (
 )
 from .daum import DaumIE
 from .dbtv import DBTVIE
 )
 from .daum import DaumIE
 from .dbtv import DBTVIE

+from .dctp import DctpTvIE

 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE

+from .dhm import DHMIE

 from .dotsub import DotsubIE
 from .dotsub import DotsubIE

+from .douyutv import DouyuTVIE

 from .dreisat import DreiSatIE
 from .dreisat import DreiSatIE

+from .drbonanza import DRBonanzaIE

 from .drtuber import DrTuberIE
 from .drtv import DRTVIE
 from .drtuber import DrTuberIE
 from .drtv import DRTVIE

+from .dvtv import DVTVIE

 from .dump import DumpIE
 from .dump import DumpIE

+from .dumpert import DumpertIE

 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE
 from .dropbox import DropboxIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE
 from .dropbox import DropboxIE

+from .eagleplatform import EaglePlatformIE

 from .ebaumsworld import EbaumsWorldIE
 from .ebaumsworld import EbaumsWorldIE

+from .echomsk import EchoMskIE

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


@@ -95,9 +135,11 @@ from .ellentv import (
     EllenTVClipsIE,
 )
 from .elpais import ElPaisIE
     EllenTVClipsIE,
 )
 from .elpais import ElPaisIE

+from .embedly import EmbedlyIE

 from .empflix import EMPFlixIE
 from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .empflix import EMPFlixIE
 from .engadget import EngadgetIE
 from .eporner import EpornerIE

+from .eroprofile import EroProfileIE

 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE


@@ -116,7 +158,11 @@ from .fktv import (
 )
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 )
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE

+from .footyroom import FootyRoomIE

 from .fourtube import FourTubeIE
 from .fourtube import FourTubeIE

+from .foxgay import FoxgayIE
+from .foxnews import FoxNewsIE
+from .foxsports import FoxSportsIE

 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (


@@ -135,11 +181,16 @@ from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,
 )
     GameOneIE,
     GameOnePlaylistIE,
 )

+from .gamersyde import GamersydeIE

 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gametrailers import GametrailersIE
 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 .gdcvault import GDCVaultIE
 from .generic import GenericIE

+from .gfycat import GfycatIE
+from .giantbomb import GiantBombIE
+from .giga import GigaIE

 from .glide import GlideIE
 from .globo import GloboIE
 from .godtube import GodTubeIE
 from .glide import GlideIE
 from .globo import GloboIE
 from .godtube import GodTubeIE


@@ -149,11 +200,16 @@ from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE

-from .grooveshark import GroovesharkIE
+from .groupon import GrouponIE

 from .hark import HarkIE
 from .hark import HarkIE

+from .hearthisat import HearThisAtIE

 from .heise import HeiseIE
 from .heise import HeiseIE

+from .hellporno import HellPornoIE

 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE

+from .historicfilms import HistoricFilmsIE
+from .history import HistoryIE
+from .hitbox import HitboxIE, HitboxLiveIE

 from .hornbunny import HornBunnyIE
 from .hostingbulk import HostingBulkIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hornbunny import HornBunnyIE
 from .hostingbulk import HostingBulkIE
 from .hotnewhiphop import HotNewHipHopIE


@@ -167,6 +223,7 @@ from .imdb import (
     ImdbIE,
     ImdbListIE
 )
     ImdbIE,
     ImdbListIE
 )

+from .imgur import ImgurIE

 from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE


@@ -182,7 +239,10 @@ from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jukebox import JukeboxIE
 from .jpopsukitv import JpopsukiIE
 from .jove import JoveIE
 from .jukebox import JukeboxIE
 from .jpopsukitv import JpopsukiIE

+from .kaltura import KalturaIE
+from .kanalplay import KanalPlayIE

 from .kankan import KankanIE
 from .kankan import KankanIE

+from .karaoketv import KaraoketvIE

 from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE


@@ -192,13 +252,23 @@ from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .ku6 import Ku6IE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE

-from .lifenews import LifeNewsIE
+from .letv import (
+    LetvIE,
+    LetvTvIE,
+    LetvPlaylistIE
+)
+from .libsyn import LibsynIE
+from .lifenews import (
+    LifeNewsIE,
+    LifeEmbedIE,
+)

 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )
 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )

+from .lnkgo import LnkGoIE

 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,
 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,


@@ -209,10 +279,13 @@ from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .malemotion import MalemotionIE
 from .mdr import MDRIE
 from .mailru import MailRuIE
 from .malemotion import MalemotionIE
 from .mdr import MDRIE

+from .megavideoz import MegaVideozIE

 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 .minhateca import MinhatecaIE

 from .ministrygrid import MinistryGridIE
 from .ministrygrid import MinistryGridIE

+from .miomio import MioMioIE

 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE
 from .mixcloud import MixcloudIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE
 from .mixcloud import MixcloudIE


@@ -238,22 +311,42 @@ from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE

-from .myspace import MySpaceIE
+from .myspace import MySpaceIE, MySpaceAlbumIE

 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE

+from .myvidster import MyVidsterIE
+from .nationalgeographic import NationalGeographicIE

 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
     NBCIE,
     NBCNewsIE,
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
     NBCIE,
     NBCNewsIE,

+    NBCSportsIE,
+    NBCSportsVPlayerIE,
+)
+from .ndr import (
+    NDRIE,
+    NJoyIE,

 )
 )

-from .ndr import NDRIE

 from .ndtv import NDTVIE
 from .ndtv import NDTVIE

+from .netzkino import NetzkinoIE
+from .nerdcubed import NerdCubedFeedIE
+from .nerdist import NerdistIE

 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE

+from .nextmedia import (
+    NextMediaIE,
+    NextMediaActionNewsIE,
+    AppleDailyRealtimeNewsIE,
+    AppleDailyAnimationNewsIE
+)

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

-from .nhl import NHLIE, NHLVideocenterIE
+from .nhl import (
+    NHLIE,
+    NHLNewsIE,
+    NHLVideocenterIE,
+)

 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE


@@ -264,67 +357,110 @@ from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .npo import (
     NPOIE,
 from .nowvideo import NowVideoIE
 from .npo import (
     NPOIE,

+    NPOLiveIE,
+    NPORadioIE,
+    NPORadioFragmentIE,

     TegenlichtVproIE,
 )
 from .nrk import (
     NRKIE,
     TegenlichtVproIE,
 )
 from .nrk import (
     NRKIE,

+    NRKPlaylistIE,

     NRKTVIE,
 )
     NRKTVIE,
 )

-from .ntv import NTVIE
-from .nytimes import NYTimesIE
+from .ntvde import NTVDeIE
+from .ntvru import NTVRuIE
+from .nytimes import (
+    NYTimesIE,
+    NYTimesArticleIE,
+)

 from .nuvid import NuvidIE
 from .nuvid import NuvidIE

+from .odnoklassniki import OdnoklassnikiIE

 from .oktoberfesttv import OktoberfestTVIE
 from .ooyala import OoyalaIE
 from .oktoberfesttv import OktoberfestTVIE
 from .ooyala import OoyalaIE

+from .openfilm import OpenFilmIE

 from .orf import (
     ORFTVthekIE,
     ORFOE1IE,
     ORFFM4IE,
 from .orf import (
     ORFTVthekIE,
     ORFOE1IE,
     ORFFM4IE,

+    ORFIPTVIE,

 )
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 )
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE

+from .philharmoniedeparis import PhilharmonieDeParisIE

 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .planetaplay import PlanetaPlayIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .planetaplay import PlanetaPlayIE

+from .pladform import PladformIE

 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .playvid import PlayvidIE
 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .playvid import PlayvidIE

+from .playwire import PlaywireIE

 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE

-from .pornhub import PornHubIE
+from .pornhub import (
+    PornHubIE,
+    PornHubPlaylistIE,
+)

 from .pornotube import PornotubeIE
 from .pornotube import PornotubeIE

+from .pornovoisines import PornoVoisinesIE

 from .pornoxo import PornoXOIE
 from .pornoxo import PornoXOIE

+from .primesharetv import PrimeShareTVIE

 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE

+from .puls4 import Puls4IE

 from .pyvideo import PyvideoIE
 from .pyvideo import PyvideoIE

+from .qqmusic import (
+    QQMusicIE,
+    QQMusicSingerIE,
+    QQMusicAlbumIE,
+    QQMusicToplistIE,
+)

 from .quickvid import QuickVidIE
 from .quickvid import QuickVidIE

+from .r7 import R7IE
+from .radiode import RadioDeIE
+from .radiojavan import RadioJavanIE
+from .radiobremen import RadioBremenIE

 from .radiofrance import RadioFranceIE
 from .rai import RaiIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .radiofrance import RadioFranceIE
 from .rai import RaiIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE

+from .restudy import RestudyIE

 from .reverbnation import ReverbNationIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .reverbnation import ReverbNationIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE

-from .rtlnl import RtlXlIE
+from .rte import RteIE
+from .rtlnl import RtlNlIE

 from .rtlnow import RTLnowIE
 from .rtlnow import RTLnowIE

+from .rtl2 import RTL2IE
+from .rtp import RTPIE

 from .rts import RTSIE
 from .rts import RTSIE

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

 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,

+    RutubeEmbedIE,

     RutubeMovieIE,
     RutubePersonIE,
 )
 from .rutv import RUTVIE
     RutubeMovieIE,
     RutubePersonIE,
 )
 from .rutv import RUTVIE

+from .sandia import SandiaIE
+from .safari import (
+    SafariIE,
+    SafariCourseIE,
+)

 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE

+from .screencastomatic import ScreencastOMaticIE
+from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
+from .senateisvp import SenateISVPIE

 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE


@@ -348,12 +484,19 @@ from .soundcloud import (
     SoundcloudUserIE,
     SoundcloudPlaylistIE
 )
     SoundcloudUserIE,
     SoundcloudPlaylistIE
 )

-from .soundgasm import SoundgasmIE
+from .soundgasm import (
+    SoundgasmIE,
+    SoundgasmProfileIE
+)

 from .southpark import (
     SouthParkIE,
 from .southpark import (
     SouthParkIE,

-    SouthparkDeIE,
+    SouthParkDeIE,
+    SouthParkDkIE,
+    SouthParkEsIE,
+    SouthParkNlIE

 )
 from .space import SpaceIE
 )
 from .space import SpaceIE

+from .spankbang import SpankBangIE

 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE


@@ -361,17 +504,25 @@ from .spike import SpikeIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .sportdeutschland import SportDeutschlandIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .sportdeutschland import SportDeutschlandIE

+from .srf import SrfIE

 from .srmediathek import SRMediathekIE
 from .srmediathek import SRMediathekIE

+from .ssa import SSAIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE

+from .streetvoice import StreetVoiceIE

 from .sunporno import SunPornoIE
 from .sunporno import SunPornoIE

+from .svt import (
+    SVTIE,
+    SVTPlayIE,
+)

 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .tapely import TapelyIE
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .tapely import TapelyIE

+from .tass import TassIE

 from .teachertube import (
     TeacherTubeIE,
     TeacherTubeUserIE,
 from .teachertube import (
     TeacherTubeIE,
     TeacherTubeUserIE,


@@ -383,8 +534,10 @@ from .ted import TEDIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telemb import TeleMBIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telemb import TeleMBIE

+from .teletask import TeleTaskIE

 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE

+from .testtube import TestTubeIE

 from .tf1 import TF1IE
 from .theonion import TheOnionIE
 from .theplatform import ThePlatformIE
 from .tf1 import TF1IE
 from .theonion import TheOnionIE
 from .theplatform import ThePlatformIE


@@ -392,6 +545,10 @@ from .thesixtyone import TheSixtyOneIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE

+from .tmz import (
+    TMZIE,
+    TMZArticleIE,
+)

 from .tnaflix import TNAFlixIE
 from .thvideo import (
     THVideoIE,
 from .tnaflix import TNAFlixIE
 from .thvideo import (
     THVideoIE,


@@ -405,26 +562,50 @@ from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tudou import TudouIE
 from .tumblr import TumblrIE
 from .tube8 import Tube8IE
 from .tudou import TudouIE
 from .tumblr import TumblrIE

+from .tunein import TuneInIE

 from .turbo import TurboIE
 from .tutv import TutvIE
 from .turbo import TurboIE
 from .tutv import TutvIE

+from .tv4 import TV4IE

 from .tvigle import TvigleIE
 from .tvigle import TvigleIE

-from .tvp import TvpIE
+from .tvp import TvpIE, TvpSeriesIE

 from .tvplay import TVPlayIE
 from .tvplay import TVPlayIE

-from .twitch import TwitchIE
+from .tweakers import TweakersIE
+from .twentyfourvideo import TwentyFourVideoIE
+from .twentytwotracks import (
+    TwentyTwoTracksIE,
+    TwentyTwoTracksGenreIE
+)
+from .twitch import (
+    TwitchVideoIE,
+    TwitchChapterIE,
+    TwitchVodIE,
+    TwitchProfileIE,
+    TwitchPastBroadcastsIE,
+    TwitchBookmarksIE,
+    TwitchStreamIE,
+)

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

+from .udn import UDNEmbedIE
+from .ultimedia import UltimediaIE

 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE

+from .varzesh3 import Varzesh3IE

 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE
 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 .vesti import VestiIE
 from .vevo import VevoIE

-from .vgtv import VGTVIE
+from .vgtv import (
+    BTArticleIE,
+    BTVestlendingenIE,
+    VGTVIE,
+)

 from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE
 from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE


@@ -438,6 +619,8 @@ from .videott import VideoTtIE
 from .videoweed import VideoWeedIE
 from .vidme import VidmeIE
 from .vidzi import VidziIE
 from .videoweed import VideoWeedIE
 from .vidme import VidmeIE
 from .vidzi import VidziIE

+from .vier import VierIE, VierVideosIE
+from .viewster import ViewsterIE

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


@@ -454,8 +637,12 @@ from .vine import (
     VineUserIE,
 )
 from .viki import VikiIE
     VineUserIE,
 )
 from .viki import VikiIE

-from .vk import VKIE
+from .vk import (
+    VKIE,
+    VKUserVideosIE,
+)

 from .vodlocker import VodlockerIE
 from .vodlocker import VodlockerIE

+from .voicerepublic import VoiceRepublicIE

 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE


@@ -470,21 +657,34 @@ from .wdr import (
     WDRMobileIE,
     WDRMausIE,
 )
     WDRMobileIE,
     WDRMausIE,
 )

+from .webofstories import WebOfStoriesIE

 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE
 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE

+from .wsj import WSJIE

 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xhamster import XHamsterIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xhamster import XHamsterIE

+from .xminus import XMinusIE

 from .xnxx import XNXXIE
 from .xnxx import XNXXIE

-from .xvideos import XVideosIE
+from .xstream import XstreamIE

 from .xtube import XTubeUserIE, XTubeIE
 from .xtube import XTubeUserIE, XTubeIE

+from .xuite import XuiteIE
+from .xvideos import XVideosIE
+from .xxxymovies import XXXYMoviesIE

 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 )
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 )

+from .yam import YamIE
+from .yandexmusic import (
+    YandexMusicTrackIE,
+    YandexMusicAlbumIE,
+    YandexMusicPlaylistIE,
+)
+from .yesjapan import YesJapanIE

 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE


@@ -502,12 +702,17 @@ from .youtube import (
     YoutubeSearchURLIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeSearchURLIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,

-    YoutubeTopListIE,
+    YoutubeTruncatedIDIE,

     YoutubeTruncatedURLIE,
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )
     YoutubeTruncatedURLIE,
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )

-from .zdf import ZDFIE
+from .zapiks import ZapiksIE
+from .zdf import ZDFIE, ZDFChannelIE
+from .zingmp3 import (
+    ZingMp3SongIE,
+    ZingMp3AlbumIE,
+)

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass


@@ -524,6 +729,17 @@ def gen_extractors():
     return [klass() for klass in _ALL_CLASSES]
 
 
     return [klass() for klass in _ALL_CLASSES]
 
 

+def list_extractors(age_limit):
+    """
+    Return a list of extractors that are suitable for the given age,
+    sorted by extractor ID.
+    """
+
+    return sorted(
+        filter(lambda ie: ie.is_suitable(age_limit), gen_extractors()),
+        key=lambda ie: ie.IE_NAME.lower())
+
+

 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""
 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""

-    return globals()[ie_name+'IE']
+    return globals()[ie_name + 'IE']