Merge remote-tracking branch 'duncankl/airmozilla'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 8dacc2c54a24f39f67678a22be9511363e92b095..67dca82aea8b19d65f211c9f9979d416b9286ff1 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,11 +1,14 @@
 from __future__ import unicode_literals
 
 from .abc import ABCIE
 from __future__ import unicode_literals
 
 from .abc import ABCIE

+from .abc7news import Abc7NewsIE

 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .adobetv import AdobeTVIE
 from .adultswim import AdultSwimIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .adobetv import AdobeTVIE
 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 .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .anitube import AnitubeIE


@@ -26,8 +29,8 @@ from .arte import (
     ArteTVEmbedIE,
 )
 from .atresplayer import AtresPlayerIE
     ArteTVEmbedIE,
 )
 from .atresplayer import AtresPlayerIE

-from .audiomack import AudiomackIE
-from .auengine import AUEngineIE
+from .atttechchannel import ATTTechChannelIE
+from .audiomack import AudiomackIE, AudiomackAlbumIE

 from .azubu import AzubuIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .azubu import AzubuIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE


@@ -47,14 +50,24 @@ from .brightcove import BrightcoveIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .buzzfeed import BuzzFeedIE
 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 .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .cinchcast import CinchcastIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE


@@ -69,9 +82,10 @@ from .cnn import (
     CNNArticleIE,
 )
 from .collegehumor import CollegeHumorIE
     CNNArticleIE,
 )
 from .collegehumor import CollegeHumorIE

+from .collegerama import CollegeRamaIE

 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE

-from .commonmistakes import CommonMistakesIE
+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


@@ -80,6 +94,7 @@ from .crunchyroll import (
     CrunchyrollShowPlaylistIE
 )
 from .cspan import CSpanIE
     CrunchyrollShowPlaylistIE
 )
 from .cspan import CSpanIE

+from .ctsnews import CtsNewsIE

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


@@ -87,10 +102,12 @@ 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 .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE

+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


@@ -110,6 +127,7 @@ 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


@@ -172,10 +190,13 @@ from .goshgay import GoshgayIE
 from .grooveshark import GroovesharkIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .grooveshark import GroovesharkIE
 from .groupon import GrouponIE
 from .hark import HarkIE

+from .hearthisat import HearThisAtIE

 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 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 .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .hostingbulk import HostingBulkIE


@@ -190,6 +211,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


@@ -206,6 +228,7 @@ from .jove import JoveIE
 from .jukebox import JukeboxIE
 from .jpopsukitv import JpopsukiIE
 from .kankan import KankanIE
 from .jukebox import JukeboxIE
 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 .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE


@@ -222,6 +245,7 @@ from .livestream import (
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )
     LivestreamOriginalIE,
     LivestreamShortenerIE,
 )

+from .lnkgo import LnkGoIE

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


@@ -266,6 +290,7 @@ from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 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 (
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (


@@ -274,12 +299,24 @@ 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 .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


@@ -290,13 +327,17 @@ 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,
     NRKTVIE,
 )
     TegenlichtVproIE,
 )
 from .nrk import (
     NRKIE,
     NRKTVIE,
 )

-from .ntv import NTVIE
+from .ntvde import NTVDeIE
+from .ntvru import NTVRuIE

 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE
 from .oktoberfesttv import OktoberfestTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE
 from .oktoberfesttv import OktoberfestTVIE


@@ -318,13 +359,17 @@ from .playfm import PlayFMIE
 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE

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

 from .pornotube import PornotubeIE
 from .pornoxo import PornoXOIE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .quickvid import QuickVidIE
 from .pornotube import PornotubeIE
 from .pornoxo import PornoXOIE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .quickvid import QuickVidIE

+from .r7 import R7IE

 from .radiode import RadioDeIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .radiode import RadioDeIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE


@@ -338,8 +383,10 @@ from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 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 .rtve import RTVEALaCartaIE, RTVELiveIE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE


@@ -352,6 +399,7 @@ from .rutube import (
     RutubePersonIE,
 )
 from .rutv import RUTVIE
     RutubePersonIE,
 )
 from .rutv import RUTVIE

+from .sandia import SandiaIE

 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE


@@ -382,7 +430,10 @@ from .soundcloud import (
     SoundcloudUserIE,
     SoundcloudPlaylistIE
 )
     SoundcloudUserIE,
     SoundcloudPlaylistIE
 )

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

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


@@ -400,7 +451,9 @@ from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 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 .svtplay import SVTPlayIE

 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE


@@ -421,6 +474,7 @@ from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .teletask import TeleTaskIE
 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


@@ -445,11 +499,21 @@ from .tumblr import TumblrIE
 from .tunein import TuneInIE
 from .turbo import TurboIE
 from .tutv import TutvIE
 from .tunein import TuneInIE
 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 .tweakers import TweakersIE

 from .twentyfourvideo import TwentyFourVideoIE
 from .twentyfourvideo import TwentyFourVideoIE

-from .twitch import TwitchIE
+from .twitch import (
+    TwitchVideoIE,
+    TwitchChapterIE,
+    TwitchVodIE,
+    TwitchProfileIE,
+    TwitchPastBroadcastsIE,
+    TwitchBookmarksIE,
+    TwitchStreamIE,
+)

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


@@ -519,6 +583,7 @@ from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE
 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


@@ -526,11 +591,13 @@ 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 .xuite import XuiteIE

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

+from .yam import YamIE

 from .yesjapan import YesJapanIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .yesjapan import YesJapanIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE


@@ -554,6 +621,7 @@ from .youtube import (
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )

+from .zapiks import ZapiksIE

 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import (
     ZingMp3SongIE,
 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import (
     ZingMp3SongIE,