Merge branch 'walla' of https://github.com/lenaten/youtube-dl into lenaten-walla

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index b07c0b4ccfb897e2c592eba05e5b07942814c49e..76726305a9c34f15bd2c59e5f8acb07eea88dae3 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -134,13 +134,16 @@ 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 .globo import GloboIE

 from .godtube import GodTubeIE
 from .godtube import GodTubeIE

+from .golem import GolemIE

 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .grooveshark import GroovesharkIE
 from .hark import HarkIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .grooveshark import GroovesharkIE
 from .hark import HarkIE

+from .heise import HeiseIE

 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hornbunny import HornBunnyIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hornbunny import HornBunnyIE


@@ -188,6 +191,7 @@ from .livestream import (
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )

+from .lrt import LRTIE

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


@@ -261,6 +265,7 @@ 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 .oktoberfesttv import OktoberfestTVIE

 from .ooyala import OoyalaIE
 from .orf import (
     ORFTVthekIE,
 from .ooyala import OoyalaIE
 from .orf import (
     ORFTVthekIE,


@@ -271,6 +276,8 @@ from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .photobucket import PhotobucketIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 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 .playfm import PlayFMIE
 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE


@@ -350,6 +357,7 @@ from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE

+from .tapely import TapelyIE

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


@@ -363,11 +371,15 @@ from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theplatform import ThePlatformIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theplatform import ThePlatformIE

+from .thesixtyone import TheSixtyOneIE

 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE
 from .tnaflix import TNAFlixIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE
 from .tnaflix import TNAFlixIE

-from .thvideo import THVideoIE
+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


@@ -408,11 +420,12 @@ from .videoweed import VideoWeedIE
 from .vidme import VidmeIE
 from .vimeo import (
     VimeoIE,
 from .vidme import VidmeIE
 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