Fix imports and general cleanup

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 3e2133f5c0754ddf64b0447d0c5aa310e7fdb711..119ec2044efca360652008105e27772b4fc13033 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+

 from .abc import ABCIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .abc import ABCIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE


@@ -22,11 +24,13 @@ from .arte import (
 )
 from .audiomack import AudiomackIE
 from .auengine import AUEngineIE
 )
 from .audiomack import AudiomackIE
 from .auengine import AUEngineIE

+from .azubu import AzubuIE

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

+from .bet import BetIE

 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE


@@ -36,6 +40,7 @@ from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE

+from .buzzfeed import BuzzFeedIE

 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .canal13cl import Canal13clIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .canal13cl import Canal13clIE


@@ -46,7 +51,7 @@ from .cbsnews import CBSNewsIE
 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 .cinemassacre import CinemassacreIE
+from .cinchcast import CinchcastIE

 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE


@@ -60,6 +65,7 @@ from .cnn import (
 )
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 )
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE

+from .comcarcoff import ComCarCoffIE

 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .criterion import CriterionIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .criterion import CriterionIE


@@ -118,6 +124,8 @@ from .fktv import (
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .fourtube import FourTubeIE
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .fourtube import FourTubeIE

+from .foxgay import FoxgayIE
+from .foxnews import FoxNewsIE

 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (


@@ -141,6 +149,7 @@ 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 .giantbomb import GiantBombIE

 from .glide import GlideIE
 from .globo import GloboIE
 from .godtube import GodTubeIE
 from .glide import GlideIE
 from .globo import GloboIE
 from .godtube import GodTubeIE


@@ -151,6 +160,7 @@ from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .grooveshark import GroovesharkIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .grooveshark import GroovesharkIE

+from .groupon import GrouponIE

 from .hark import HarkIE
 from .heise import HeiseIE
 from .helsinki import HelsinkiIE
 from .hark import HarkIE
 from .heise import HeiseIE
 from .helsinki import HelsinkiIE


@@ -213,6 +223,7 @@ from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE

+from .minhateca import MinhatecaIE

 from .ministrygrid import MinistryGridIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE
 from .ministrygrid import MinistryGridIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE


@@ -239,9 +250,10 @@ from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE

-from .myspace import MySpaceIE
+from .myspace import MySpaceIE, MySpaceAlbumIE

 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE

+from .myvidster import MyVidsterIE

 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (


@@ -299,6 +311,7 @@ from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .quickvid import QuickVidIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .quickvid import QuickVidIE

+from .radiode import RadioDeIE

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


@@ -311,6 +324,7 @@ from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .rtlnl import RtlXlIE
 from .rtlnow import RTLnowIE
 from .rtbf import RTBFIE
 from .rtlnl import RtlXlIE
 from .rtlnow import RTLnowIE

+from .rtp import RTPIE

 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE
 from .ruhd import RUHDIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE
 from .ruhd import RUHDIE


@@ -326,6 +340,7 @@ from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE

+from .screenwavemedia import CinemassacreIE, ScreenwaveMediaIE, TeamFourIE

 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE


@@ -373,6 +388,7 @@ from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .tapely import TapelyIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .tapely import TapelyIE

+from .tass import TassIE

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


@@ -413,6 +429,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 .twentyfourvideo import TwentyFourVideoIE

 from .twitch import TwitchIE
 from .ubu import UbuIE
 from .udemy import (
 from .twitch import TwitchIE
 from .ubu import UbuIE
 from .udemy import (


@@ -514,7 +531,7 @@ from .youtube import (
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )

-from .zdf import ZDFIE
+from .zdf import ZDFIE, ZDFChannelIE

 from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,