Prepare for release.

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index e49ac3e52783608942b34deed950703d2a85dc39..0902eb4374caf943e1af4e23aeb7c74a8386a794 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,13 +1,21 @@
+from __future__ import unicode_literals
+
+from .abc import ABCIE

 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 .aftonbladet import AftonbladetIE
 from .aftonbladet import AftonbladetIE

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

 from .anitube import AnitubeIE
 from .anitube import AnitubeIE

+from .anysex import AnySexIE

 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE

-from .ard import ARDIE
+from .ard import ARDIE, ARDMediathekIE

 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,


@@ -17,17 +25,27 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )

+from .atresplayer import AtresPlayerIE
+from .atttechchannel import ATTTechChannelIE
+from .audiomack import AudiomackIE, AudiomackAlbumIE

 from .auengine import AUEngineIE
 from .auengine import AUEngineIE

+from .azubu import AzubuIE

 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE

+from .beeg import BeegIE
+from .behindkink import BehindKinkIE
+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 .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 .canal13cl import Canal13clIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .canal13cl import Canal13clIE


@@ -38,47 +56,71 @@ from .cbsnews import CBSNewsIE
 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 .cinemassacre import CinemassacreIE
+from .cinchcast import CinchcastIE

 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE

+from .cloudy import CloudyIE

 from .clubic import ClubicIE
 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (
     CNNIE,
     CNNBlogsIE,
 from .clubic import ClubicIE
 from .cmt import CMTIE
 from .cnet import CNETIE
 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

 from .condenast import CondeNastIE
 from .condenast import CondeNastIE

+from .cracked import CrackedIE

 from .criterion import CriterionIE
 from .criterion import CriterionIE

-from .crunchyroll import CrunchyrollIE
+from .crunchyroll import (
+    CrunchyrollIE,
+    CrunchyrollShowPlaylistIE
+)

 from .cspan import CSpanIE
 from .cspan import CSpanIE

-from .d8 import D8IE

 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
 )
 from .daum import DaumIE
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
 )
 from .daum import DaumIE

+from .dbtv import DBTVIE
+from .deezer import DeezerPlaylistIE
+from .dfb import DFBIE

 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE

+from .drbonanza import DRBonanzaIE
+from .drtuber import DrTuberIE

 from .drtv import DRTVIE
 from .drtv import DRTVIE

+from .dvtv import DVTVIE
+from .dump import DumpIE

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

+from .echomsk import EchoMskIE

 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE

+from .einthusan import EinthusanIE

 from .eitb import EitbIE
 from .eitb import EitbIE

+from .ellentv import (
+    EllenTVIE,
+    EllenTVClipsIE,
+)

 from .elpais import ElPaisIE
 from .elpais import ElPaisIE

-from .empflix import EmpflixIE
+from .empflix import EMPFlixIE

 from .engadget import EngadgetIE
 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

+from .expotv import ExpoTVIE

 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE


@@ -92,7 +134,10 @@ from .fktv import (
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE

+from .folketinget import FolketingetIE

 from .fourtube import FourTubeIE
 from .fourtube import FourTubeIE

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

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


@@ -104,22 +149,42 @@ from .francetv import (
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE

+from .freevideo import FreeVideoIE

 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE

-from .gameone import GameOneIE
+from .gameone import (
+    GameOneIE,
+    GameOnePlaylistIE,
+)

 from .gamespot import GameSpotIE
 from .gamespot import GameSpotIE

+from .gamestar import GameStarIE

 from .gametrailers import GametrailersIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE
 from .gametrailers import GametrailersIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE

+from .giantbomb import GiantBombIE
+from .giga import GigaIE
+from .glide import GlideIE
+from .globo import GloboIE
+from .godtube import GodTubeIE
+from .goldenmoustache import GoldenMoustacheIE
+from .golem import GolemIE

 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .googleplus import GooglePlusIE
 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 .heise import HeiseIE
+from .hellporno import HellPornoIE

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

+from .hitbox import HitboxIE, HitboxLiveIE
+from .hornbunny import HornBunnyIE
+from .hostingbulk import HostingBulkIE

 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE

+from .howstuffworks import HowStuffWorksIE

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


@@ -137,19 +202,23 @@ from .ivi import (
     IviIE,
     IviCompilationIE
 )
     IviIE,
     IviCompilationIE
 )

+from .izlesene import IzleseneIE

 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE

+from .jove import JoveIE

 from .jukebox import JukeboxIE
 from .jukebox import JukeboxIE

-from .justintv import JustinTVIE

 from .jpopsukitv import JpopsukiIE
 from .kankan import KankanIE
 from .jpopsukitv import JpopsukiIE
 from .kankan import KankanIE

+from .karaoketv import KaraoketvIE

 from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE
 from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE

+from .krasview import KrasViewIE

 from .ku6 import Ku6IE
 from .la7 import LA7IE
 from .ku6 import Ku6IE
 from .la7 import LA7IE

+from .laola1tv import Laola1TvIE

 from .lifenews import LifeNewsIE
 from .liveleak import LiveLeakIE
 from .livestream import (
 from .lifenews import LifeNewsIE
 from .liveleak import LiveLeakIE
 from .livestream import (


@@ -157,6 +226,8 @@ from .livestream import (
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )

+from .lnkgo import LnkGoIE
+from .lrt import LRTIE

 from .lynda import (
     LyndaIE,
     LyndaCourseIE
 from .lynda import (
     LyndaIE,
     LyndaCourseIE


@@ -168,14 +239,23 @@ from .malemotion import MalemotionIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE

+from .mgoon import MgoonIE
+from .minhateca import MinhatecaIE
+from .ministrygrid import MinistryGridIE

 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE

+from .mitele import MiTeleIE

 from .mixcloud import MixcloudIE
 from .mixcloud import MixcloudIE

+from .mlb import MLBIE

 from .mpora import MporaIE
 from .mpora import MporaIE

+from .moevideo import MoeVideoIE

 from .mofosex import MofosexIE
 from .mofosex import MofosexIE

+from .mojvideo import MojvideoIE
+from .moniker import MonikerIE

 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
 from .motorsport import MotorsportIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
 from .motorsport import MotorsportIE

+from .movieclips import MovieClipsIE

 from .moviezine import MoviezineIE
 from .movshare import MovShareIE
 from .mtv import (
 from .moviezine import MoviezineIE
 from .movshare import MovShareIE
 from .mtv import (


@@ -183,11 +263,14 @@ from .mtv import (
     MTVServicesEmbeddedIE,
     MTVIggyIE,
 )
     MTVServicesEmbeddedIE,
     MTVIggyIE,
 )

+from .muenchentv import MuenchenTVIE

 from .musicplayon import MusicPlayOnIE
 from .musicplayon import MusicPlayOnIE

+from .musicvault import MusicVaultIE

 from .muzu import MuzuTVIE
 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 .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (


@@ -196,18 +279,26 @@ from .nbc import (
 )
 from .ndr import NDRIE
 from .ndtv import NDTVIE
 )
 from .ndr import NDRIE
 from .ndtv import NDTVIE

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

 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nfb import NFBIE
 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nfb import NFBIE

+from .nfl import NFLIE

 from .nhl import NHLIE, NHLVideocenterIE
 from .nhl import NHLIE, NHLVideocenterIE

-from .niconico import NiconicoIE
+from .niconico import NiconicoIE, NiconicoPlaylistIE

 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE

+from .nosvideo import NosVideoIE

 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE

-from .npo import NPOIE
+from .npo import (
+    NPOIE,
+    NPOLiveIE,
+    TegenlichtVproIE,
+)

 from .nrk import (
     NRKIE,
     NRKTVIE,
 from .nrk import (
     NRKIE,
     NRKTVIE,


@@ -215,44 +306,72 @@ from .nrk import (
 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE
 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE

-from .oe1 import OE1IE
+from .oktoberfesttv import OktoberfestTVIE

 from .ooyala import OoyalaIE
 from .ooyala import OoyalaIE

-from .orf import ORFIE
+from .openfilm import OpenFilmIE
+from .orf import (
+    ORFTVthekIE,
+    ORFOE1IE,
+    ORFFM4IE,
+)

 from .parliamentliveuk import ParliamentLiveUKIE
 from .parliamentliveuk import ParliamentLiveUKIE

+from .patreon import PatreonIE

 from .pbs import PBSIE
 from .pbs import PBSIE

+from .phoenix import PhoenixIE

 from .photobucket import PhotobucketIE
 from .photobucket import PhotobucketIE

+from .planetaplay import PlanetaPlayIE
+from .played import PlayedIE
+from .playfm import PlayFMIE

 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE
 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE

+from .pornoxo import PornoXOIE
+from .promptfile import PromptFileIE

 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE

+from .quickvid import QuickVidIE
+from .radiode import RadioDeIE
+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 .rte import RteIE
+from .rtlnl import RtlXlIE

 from .rtlnow import RTLnowIE
 from .rtlnow import RTLnowIE

+from .rtp import RTPIE

 from .rts import RTSIE
 from .rts import RTSIE

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

 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 .sapo import SapoIE

 from .savefrom import SaveFromIE
 from .savefrom import SaveFromIE

+from .sbs import SBSIE

 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE

+from .screencastomatic import ScreencastOMaticIE
+from .screenwavemedia import CinemassacreIE, ScreenwaveMediaIE, TeamFourIE

 from .servingsys import ServingSysIE
 from .servingsys import ServingSysIE

+from .sexu import SexuIE
+from .sexykarma import SexyKarmaIE
+from .shared import SharedIE
+from .sharesix import ShareSixIE

 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE


@@ -262,6 +381,8 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

+from .snotr import SnotrIE
+from .sockshare import SockshareIE

 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,
 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,


@@ -276,17 +397,24 @@ from .southpark import (
 )
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 )
 from .space import SpaceIE
 from .spankwire import SpankwireIE

-from .spiegel import SpiegelIE
+from .spiegel import SpiegelIE, SpiegelArticleIE

 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE

+from .sport5 import Sport5IE
+from .sportbox import SportBoxIE
+from .sportdeutschland import SportDeutschlandIE
+from .srmediathek import SRMediathekIE

 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 .sunporno import SunPornoIE

 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 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,


@@ -295,13 +423,25 @@ from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE

+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 .tf1 import TF1IE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE

+from .theonion import TheOnionIE

 from .theplatform import ThePlatformIE
 from .theplatform import ThePlatformIE

+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
+from .tnaflix import TNAFlixIE
+from .thvideo import (
+    THVideoIE,
+    THVideoPlaylistIE
+)

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


@@ -310,9 +450,15 @@ 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 .tvigle import TvigleIE
 from .tutv import TutvIE
 from .tvigle import TvigleIE

-from .tvp import TvpIE
+from .tvp import TvpIE, TvpSeriesIE
+from .tvplay import TVPlayIE
+from .twentyfourvideo import TwentyFourVideoIE
+from .twitch import TwitchIE
+from .ubu import UbuIE

 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 from .udemy import (
     UdemyIE,
     UdemyCourseIE


@@ -325,22 +471,29 @@ from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .vesti import VestiIE
 from .vevo import VevoIE
 from .veoh import VeohIE
 from .vesti import VestiIE
 from .vevo import VevoIE

+from .vgtv import VGTVIE

 from .vh1 import VH1IE
 from .vh1 import VH1IE

+from .vice import ViceIE

 from .viddler import ViddlerIE
 from .videobam import VideoBamIE
 from .videodetective import VideoDetectiveIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE
 from .viddler import ViddlerIE
 from .videobam import VideoBamIE
 from .videodetective import VideoDetectiveIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE

+from .videomega import VideoMegaIE

 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE

+from .vidme import VidmeIE
+from .vidzi import VidziIE
+from .vier import VierIE, VierVideosIE

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

-    VimeoChannelIE,
-    VimeoUserIE,

     VimeoAlbumIE,
     VimeoAlbumIE,

+    VimeoChannelIE,

     VimeoGroupsIE,
     VimeoGroupsIE,

+    VimeoLikesIE,

     VimeoReviewIE,
     VimeoReviewIE,

+    VimeoUserIE,

     VimeoWatchLaterIE,
 )
 from .vimple import VimpleIE
     VimeoWatchLaterIE,
 )
 from .vimple import VimpleIE


@@ -349,36 +502,49 @@ 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 .vporn import VpornIE
+from .vrt import VRTIE

 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vulture import VultureIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vulture import VultureIE

+from .walla import WallaIE

 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE

+from .wayofthemaster import WayOfTheMasterIE

 from .wdr import (
     WDRIE,
     WDRMobileIE,
     WDRMausIE,
 )
 from .wdr import (
     WDRIE,
     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 .xbef import XBefIE
 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE
 from .xbef import XBefIE

+from .xboxclips import XboxClipsIE

 from .xhamster import XHamsterIE
 from .xhamster import XHamsterIE

+from .xminus import XMinusIE

 from .xnxx import XNXXIE
 from .xvideos import XVideosIE
 from .xtube import XTubeUserIE, XTubeIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE
 from .xtube import XTubeUserIE, XTubeIE

+from .xxxymovies import XXXYMoviesIE

 from .yahoo import (
     YahooIE,
 from .yahoo import (
     YahooIE,

-    YahooNewsIE,

     YahooSearchIE,
 )
     YahooSearchIE,
 )

+from .yesjapan import YesJapanIE
+from .ynet import YnetIE

 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .youporn import YouPornIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .youporn import YouPornIE

+from .yourupload import YourUploadIE

 from .youtube import (
     YoutubeIE,
     YoutubeChannelIE,
 from .youtube import (
     YoutubeIE,
     YoutubeChannelIE,


@@ -391,13 +557,16 @@ from .youtube import (
     YoutubeSearchURLIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeSearchURLIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,

-    YoutubeTopListIE,
+    YoutubeTruncatedIDIE,

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

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

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass


@@ -414,6 +583,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']