projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:rg3/youtube-dl into weibo
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index f1ea735b5b3dd4ce6a4a05d4ec6b27280696aa30..e863f03ab6e94302d844b81fa201c581ef53f6f1 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,
@@
-246,7
+243,6
@@
from .dailymotion import (
DailymotionIE,
DailymotionPlaylistIE,
DailymotionUserIE,
DailymotionIE,
DailymotionPlaylistIE,
DailymotionUserIE,
- DailymotionCloudIE,
)
from .daisuki import (
DaisukiMottoIE,
)
from .daisuki import (
DaisukiMottoIE,
@@
-312,9
+308,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
@@
-325,6
+322,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
@@
-689,6
+687,7
@@
from .nhl import (
)
from .nick import (
NickIE,
)
from .nick import (
NickIE,
+ NickBrIE,
NickDeIE,
NickNightIE,
NickRuIE,
NickDeIE,
NickNightIE,
NickRuIE,
@@
-721,10
+720,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,
@@
-857,6
+852,7
@@
from .radiofrance import RadioFranceIE
from .rai import (
RaiPlayIE,
RaiPlayLiveIE,
from .rai import (
RaiPlayIE,
RaiPlayLiveIE,
+ RaiPlayPlaylistIE,
RaiIE,
)
from .rbmaradio import RBMARadioIE
RaiIE,
)
from .rbmaradio import RBMARadioIE
@@
-931,8
+927,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
+1000,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
+1103,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,
@@
-1139,6
+1144,7
@@
from .udemy import (
from .udn import UDNEmbedIE
from .uktvplay import UKTVPlayIE
from .digiteka import DigitekaIE
from .udn import UDNEmbedIE
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