Merge remote-tracking branch 'WillSewell/vk-playlists'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 348f5767a20000b49ff04f8c31dd379ca6f92df9..fcb75af34a4b7ea534435544e719749685f78725 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -20,12 +20,14 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )

+from .audiomack import AudiomackIE

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

+from .bild import BildIE

 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE


@@ -60,9 +62,11 @@ from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 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 .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,
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,


@@ -111,6 +115,7 @@ from .fktv import (
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE

+from .folketinget import FolketingetIE

 from .fourtube import FourTubeIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .fourtube import FourTubeIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE


@@ -123,6 +128,7 @@ 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 .gameone import (
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .gameone import (


@@ -134,7 +140,10 @@ 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 .glide import GlideIE
+from .globo import GloboIE

 from .godtube import GodTubeIE
 from .godtube import GodTubeIE

+from .goldenmoustache import GoldenMoustacheIE

 from .golem import GolemIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .golem import GolemIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE


@@ -172,7 +181,6 @@ from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jukebox import JukeboxIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jukebox import JukeboxIE

-from .justintv import JustinTVIE

 from .jpopsukitv import JpopsukiIE
 from .kankan import KankanIE
 from .keezmovies import KeezMoviesIE
 from .jpopsukitv import JpopsukiIE
 from .kankan import KankanIE
 from .keezmovies import KeezMoviesIE


@@ -183,6 +191,7 @@ from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .la7 import LA7IE
 from .krasview import KrasViewIE
 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 (


@@ -245,7 +254,7 @@ from .newstube import NewstubeIE
 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .nfb import NFBIE
 from .nfl import NFLIE
 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


@@ -274,6 +283,7 @@ from .orf import (
 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 .phoenix import PhoenixIE

 from .photobucket import PhotobucketIE
 from .planetaplay import PlanetaPlayIE
 from .played import PlayedIE
 from .photobucket import PhotobucketIE
 from .planetaplay import PlanetaPlayIE
 from .played import PlayedIE


@@ -287,6 +297,7 @@ from .pornoxo import PornoXOIE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE

+from .quickvid import QuickVidIE

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


@@ -315,6 +326,8 @@ from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .servingsys import ServingSysIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 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 .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE


@@ -346,7 +359,9 @@ from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .sport5 import Sport5IE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .sport5 import Sport5IE

+from .sportbox import SportBoxIE

 from .sportdeutschland import SportDeutschlandIE
 from .sportdeutschland import SportDeutschlandIE

+from .srmediathek import SRMediathekIE

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


@@ -365,11 +380,15 @@ 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 .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .telemb import TeleMBIE
 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


@@ -391,6 +410,7 @@ from .tutv import TutvIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE
 from .tvplay import TVPlayIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE
 from .tvplay import TVPlayIE

+from .twitch import TwitchIE

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


@@ -406,6 +426,7 @@ from .vesti import VestiIE
 from .vevo import VevoIE
 from .vgtv import VGTVIE
 from .vh1 import VH1IE
 from .vevo import VevoIE
 from .vgtv import VGTVIE
 from .vh1 import VH1IE

+from .vice import ViceIE

 from .viddler import ViddlerIE
 from .videobam import VideoBamIE
 from .videodetective import VideoDetectiveIE
 from .viddler import ViddlerIE
 from .videobam import VideoBamIE
 from .videodetective import VideoDetectiveIE


@@ -416,6 +437,7 @@ from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE
 from .vidme import VidmeIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE
 from .vidme import VidmeIE

+from .vidzi import VidziIE

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


@@ -432,12 +454,17 @@ 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 .vporn import VpornIE
 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 .wayofthemaster import WayOfTheMasterIE
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wayofthemaster import WayOfTheMasterIE


@@ -459,7 +486,6 @@ from .xvideos import XVideosIE
 from .xtube import XTubeUserIE, XTubeIE
 from .yahoo import (
     YahooIE,
 from .xtube import XTubeUserIE, XTubeIE
 from .yahoo import (
     YahooIE,

-    YahooNewsIE,

     YahooSearchIE,
 )
 from .ynet import YnetIE
     YahooSearchIE,
 )
 from .ynet import YnetIE


@@ -484,10 +510,8 @@ from .youtube import (
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )

-

 from .zdf import ZDFIE
 
 from .zdf import ZDFIE
 

-

 _ALL_CLASSES = [
     klass
     for name, klass in globals().items()
 _ALL_CLASSES = [
     klass
     for name, klass in globals().items()