projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'weibo' of https://github.com/sprhawk/youtube-dl into sprhawk-weibo
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index b9c97fac45fa0285217fc3da0b1bb358ecef12f5..a3ad4df1f1d858f8ffc67ab823afe5a3fec9d07c 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-138,10
+138,7
@@
from .brightcove import (
BrightcoveNewIE,
)
from .buzzfeed import BuzzFeedIE
BrightcoveNewIE,
)
from .buzzfeed import BuzzFeedIE
-from .byutv import (
- BYUtvIE,
- BYUtvEventIE,
-)
+from .byutv import BYUtvIE
from .c56 import C56IE
from .camdemy import (
CamdemyIE,
from .c56 import C56IE
from .camdemy import (
CamdemyIE,
@@
-208,7
+205,6
@@
from .cnn import (
CNNArticleIE,
)
from .coub import CoubIE
CNNArticleIE,
)
from .coub import CoubIE
-from .collegerama import CollegeRamaIE
from .comedycentral import (
ComedyCentralFullEpisodesIE,
ComedyCentralIE,
from .comedycentral import (
ComedyCentralFullEpisodesIE,
ComedyCentralIE,
@@
-311,9
+307,10
@@
from .ehow import EHowIE
from .eighttracks import EightTracksIE
from .einthusan import EinthusanIE
from .eitb import EitbIE
from .eighttracks import EightTracksIE
from .einthusan import EinthusanIE
from .eitb import EitbIE
-from .ellentv import (
- EllenTVIE,
- EllenTVClipsIE,
+from .ellentube import (
+ EllenTubeIE,
+ EllenTubeVideoIE,
+ EllenTubePlaylistIE,
)
from .elpais import ElPaisIE
from .embedly import EmbedlyIE
)
from .elpais import ElPaisIE
from .embedly import EmbedlyIE
@@
-324,6
+321,7
@@
from .escapist import EscapistIE
from .espn import (
ESPNIE,
ESPNArticleIE,
from .espn import (
ESPNIE,
ESPNArticleIE,
+ FiveThirtyEightIE,
)
from .esri import EsriVideoIE
from .etonline import ETOnlineIE
)
from .esri import EsriVideoIE
from .etonline import ETOnlineIE
@@
-346,6
+344,7
@@
from .filmon import (
FilmOnIE,
FilmOnChannelIE,
)
FilmOnIE,
FilmOnChannelIE,
)
+from .filmweb import FilmwebIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
from .fivetv import FiveTVIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
from .fivetv import FiveTVIE
@@
-466,6
+465,7
@@
from .indavideo import (
)
from .infoq import InfoQIE
from .instagram import InstagramIE, InstagramUserIE
)
from .infoq import InfoQIE
from .instagram import InstagramIE, InstagramUserIE
+from .internazionale import InternazionaleIE
from .internetvideoarchive import InternetVideoArchiveIE
from .iprima import IPrimaIE
from .iqiyi import IqiyiIE
from .internetvideoarchive import InternetVideoArchiveIE
from .iprima import IPrimaIE
from .iqiyi import IqiyiIE
@@
-575,6
+575,7
@@
from .massengeschmacktv import MassengeschmackTVIE
from .matchtv import MatchTVIE
from .mdr import MDRIE
from .mediaset import MediasetIE
from .matchtv import MatchTVIE
from .mdr import MDRIE
from .mediaset import MediasetIE
+from .mediasite import MediasiteIE
from .medici import MediciIE
from .megaphone import MegaphoneIE
from .meipai import MeipaiIE
from .medici import MediciIE
from .megaphone import MegaphoneIE
from .meipai import MeipaiIE
@@
-608,7
+609,10
@@
from .mofosex import MofosexIE
from .mojvideo import MojvideoIE
from .moniker import MonikerIE
from .morningstar import MorningstarIE
from .mojvideo import MojvideoIE
from .moniker import MonikerIE
from .morningstar import MorningstarIE
-from .motherless import MotherlessIE
+from .motherless import (
+ MotherlessIE,
+ MotherlessGroupIE
+)
from .motorsport import MotorsportIE
from .movieclips import MovieClipsIE
from .moviezine import MoviezineIE
from .motorsport import MotorsportIE
from .movieclips import MovieClipsIE
from .moviezine import MoviezineIE
@@
-688,6
+692,7
@@
from .nhl import (
)
from .nick import (
NickIE,
)
from .nick import (
NickIE,
+ NickBrIE,
NickDeIE,
NickNightIE,
NickRuIE,
NickDeIE,
NickNightIE,
NickRuIE,
@@
-720,10
+725,6
@@
from .nowness import (
NownessPlaylistIE,
NownessSeriesIE,
)
NownessPlaylistIE,
NownessSeriesIE,
)
-from .nowtv import (
- NowTVIE,
- NowTVListIE,
-)
from .noz import NozIE
from .npo import (
AndereTijdenIE,
from .noz import NozIE
from .npo import (
AndereTijdenIE,
@@
-914,7
+915,6
@@
from .rutube import (
from .rutv import RUTVIE
from .ruutu import RuutuIE
from .ruv import RuvIE
from .rutv import RUTVIE
from .ruutu import RuutuIE
from .ruv import RuvIE
-from .sandia import SandiaIE
from .safari import (
SafariIE,
SafariApiIE,
from .safari import (
SafariIE,
SafariApiIE,
@@
-931,8
+931,12
@@
from .senateisvp import SenateISVPIE
from .sendtonews import SendtoNewsIE
from .servingsys import ServingSysIE
from .servus import ServusIE
from .sendtonews import SendtoNewsIE
from .servingsys import ServingSysIE
from .servus import ServusIE
+from .sevenplus import SevenPlusIE
from .sexu import SexuIE
from .sexu import SexuIE
-from .shahid import ShahidIE
+from .shahid import (
+ ShahidIE,
+ ShahidShowIE,
+)
from .shared import (
SharedIE,
VivoIE,
from .shared import (
SharedIE,
VivoIE,
@@
-1000,6
+1004,7
@@
from .streamango import StreamangoIE
from .streamcloud import StreamcloudIE
from .streamcz import StreamCZIE
from .streetvoice import StreetVoiceIE
from .streamcloud import StreamcloudIE
from .streamcz import StreamCZIE
from .streetvoice import StreetVoiceIE
+from .stretchinternet import StretchInternetIE
from .sunporno import SunPornoIE
from .svt import (
SVTIE,
from .sunporno import SunPornoIE
from .svt import (
SVTIE,
@@
-1102,6
+1107,10
@@
from .tvigle import TvigleIE
from .tvland import TVLandIE
from .tvn24 import TVN24IE
from .tvnoe import TVNoeIE
from .tvland import TVLandIE
from .tvn24 import TVN24IE
from .tvnoe import TVNoeIE
+from .tvnow import (
+ TVNowIE,
+ TVNowListIE,
+)
from .tvp import (
TVPEmbedIE,
TVPIE,
from .tvp import (
TVPEmbedIE,
TVPIE,
@@
-1115,6
+1124,7
@@
from .tvplayer import TVPlayerIE
from .tweakers import TweakersIE
from .twentyfourvideo import TwentyFourVideoIE
from .twentymin import TwentyMinutenIE
from .tweakers import TweakersIE
from .twentyfourvideo import TwentyFourVideoIE
from .twentymin import TwentyMinutenIE
+from .twentythreevideo import TwentyThreeVideoIE
from .twitch import (
TwitchVideoIE,
TwitchChapterIE,
from .twitch import (
TwitchVideoIE,
TwitchChapterIE,
@@
-1137,8
+1147,10
@@
from .udemy import (
UdemyCourseIE
)
from .udn import UDNEmbedIE
UdemyCourseIE
)
from .udn import UDNEmbedIE
+from .ufctv import UFCTVIE
from .uktvplay import UKTVPlayIE
from .digiteka import DigitekaIE
from .uktvplay import UKTVPlayIE
from .digiteka import DigitekaIE
+from .umg import UMGDeIE
from .unistra import UnistraIE
from .unity import UnityIE
from .uol import UOLIE
from .unistra import UnistraIE
from .unity import UnityIE
from .uol import UOLIE
@@
-1286,6
+1298,10
@@
from .webofstories import (
WebOfStoriesIE,
WebOfStoriesPlaylistIE,
)
WebOfStoriesIE,
WebOfStoriesPlaylistIE,
)
+from .weibo import (
+ WeiboIE,
+ WeiboMobileIE
+)
from .weiqitv import WeiqiTVIE
from .wimp import WimpIE
from .wistia import WistiaIE
from .weiqitv import WeiqiTVIE
from .wimp import WimpIE
from .wistia import WistiaIE