[teachertube] Fix extraction for Python 3

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 697bcab87dfe0a53755ddb7c3fc214ad378636e5..15a42ce44246f708a6b06027c366a4b41eab5c7b 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -72,6 +72,7 @@ from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elpais import ElPaisIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elpais import ElPaisIE

+from .empflix import EmpflixIE

 from .engadget import EngadgetIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .engadget import EngadgetIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE


@@ -79,6 +80,7 @@ from .exfm import ExfmIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE

+from .fc2 import FC2IE

 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE


@@ -109,6 +111,7 @@ from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE
 from .googlesearch import GoogleSearchIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE

+from .hentaistigma import HentaiStigmaIE

 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .huffpost import HuffPostIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .huffpost import HuffPostIE


@@ -139,6 +142,7 @@ from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE

+from .ku6 import Ku6IE

 from .la7 import LA7IE
 from .lifenews import LifeNewsIE
 from .liveleak import LiveLeakIE
 from .la7 import LA7IE
 from .lifenews import LifeNewsIE
 from .liveleak import LiveLeakIE


@@ -191,9 +195,13 @@ from .normalboots import NormalbootsIE
 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 .nrk import NRKIE
+from .nrk import (
+    NRKIE,
+    NRKTVIE,
+)

 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .ntv import NTVIE
 from .nytimes import NYTimesIE

+from .nuvid import NuvidIE

 from .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .orf import ORFIE
 from .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .orf import ORFIE


@@ -251,13 +259,21 @@ from .southparkstudios import (
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE

+from .spiegeltv import SpiegeltvIE

 from .spike import SpikeIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .spike import SpikeIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE

+from .swrmediathek import SWRMediathekIE

 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE

+from .tagesschau import TagesschauIE
+from .teachertube import (
+    TeacherTubeIE,
+    TeacherTubeClassroomIE,
+)
+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


@@ -290,12 +306,14 @@ 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 .vh1 import VH1IE

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

+from .videott import VideoTtIE

 from .videoweed import VideoWeedIE
 from .vimeo import (
     VimeoIE,
 from .videoweed import VideoWeedIE
 from .vimeo import (
     VimeoIE,


@@ -306,7 +324,10 @@ from .vimeo import (
     VimeoReviewIE,
     VimeoWatchLaterIE,
 )
     VimeoReviewIE,
     VimeoWatchLaterIE,
 )

-from .vine import VineIE
+from .vine import (
+    VineIE,
+    VineUserIE,
+)

 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE


@@ -315,6 +336,7 @@ from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wdr import (
     WDRIE,
 from .wat import WatIE
 from .wdr import (
     WDRIE,

+    WDRMobileIE,

     WDRMausIE,
 )
 from .weibo import WeiboIE
     WDRMausIE,
 )
 from .weibo import WeiboIE