Merge branch 'the-daily-show-podcast' of https://github.com/fstirlitz/youtube-dl...

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 867e7c93574314a42bf6c45570fde3074e39e40b..a20492fc372e73577536c93e04986152d5e2d0d1 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -84,7 +84,7 @@ from .cnn import (
 )
 from .collegehumor import CollegeHumorIE
 from .collegerama import CollegeRamaIE
 )
 from .collegehumor import CollegeHumorIE
 from .collegerama import CollegeRamaIE

-from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
+from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE, TheDailyShowPodcastIE

 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .condenast import CondeNastIE
 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .condenast import CondeNastIE


@@ -251,6 +251,7 @@ from .letv import (
     LetvPlaylistIE
 )
 from .lifenews import LifeNewsIE
     LetvPlaylistIE
 )
 from .lifenews import LifeNewsIE

+from .libsyn import LibsynIE

 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,
 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,


@@ -346,6 +347,7 @@ from .npo import (
 )
 from .nrk import (
     NRKIE,
 )
 from .nrk import (
     NRKIE,

+    NRKPlaylistIE,

     NRKTVIE,
 )
 from .ntvde import NTVDeIE
     NRKTVIE,
 )
 from .ntvde import NTVDeIE


@@ -534,11 +536,11 @@ from .twitch import (
     TwitchStreamIE,
 )
 from .ubu import UbuIE
     TwitchStreamIE,
 )
 from .ubu import UbuIE

-from .ultimedia import UltimediaIE

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

+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