projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'Boris-de/wdrmaus_fix#8562'
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index aac85066fd6de4839f0fa28cbc498c63decfe00f..d107080f5dcd3f5c24653eea56076b00f152ba88 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-3,6
+3,10
@@
from __future__ import unicode_literals
from .abc import ABCIE
from .abc7news import Abc7NewsIE
from .abc import ABCIE
from .abc7news import Abc7NewsIE
+from .abcnews import (
+ AbcNewsIE,
+ AbcNewsVideoIE,
+)
from .academicearth import AcademicEarthCourseIE
from .acast import (
ACastIE,
from .academicearth import AcademicEarthCourseIE
from .acast import (
ACastIE,
@@
-52,6
+56,7
@@
from .arte import (
ArteTVDDCIE,
ArteTVMagazineIE,
ArteTVEmbedIE,
ArteTVDDCIE,
ArteTVMagazineIE,
ArteTVEmbedIE,
+ ArteTVPlaylistIE,
)
from .atresplayer import AtresPlayerIE
from .atttechchannel import ATTTechChannelIE
)
from .atresplayer import AtresPlayerIE
from .atttechchannel import ATTTechChannelIE
@@
-75,6
+80,7
@@
from .bigflix import BigflixIE
from .bild import BildIE
from .bilibili import BiliBiliIE
from .biobiochiletv import BioBioChileTVIE
from .bild import BildIE
from .bilibili import BiliBiliIE
from .biobiochiletv import BioBioChileTVIE
+from .biqle import BIQLEIE
from .bleacherreport import (
BleacherReportIE,
BleacherReportCMSIE,
from .bleacherreport import (
BleacherReportIE,
BleacherReportCMSIE,
@@
-106,6
+112,7
@@
from .cbc import (
CBCPlayerIE,
)
from .cbs import CBSIE
CBCPlayerIE,
)
from .cbs import CBSIE
+from .cbslocal import CBSLocalIE
from .cbsinteractive import CBSInteractiveIE
from .cbsnews import (
CBSNewsIE,
from .cbsinteractive import CBSInteractiveIE
from .cbsnews import (
CBSNewsIE,
@@
-123,7
+130,6
@@
from .chirbit import (
ChirbitProfileIE,
)
from .cinchcast import CinchcastIE
ChirbitProfileIE,
)
from .cinchcast import CinchcastIE
-from .cinemassacre import CinemassacreIE
from .cliprs import ClipRsIE
from .clipfish import ClipfishIE
from .cliphunter import CliphunterIE
from .cliprs import ClipRsIE
from .clipfish import ClipfishIE
from .cliphunter import CliphunterIE
@@
-138,7
+144,7
@@
from .cnn import (
CNNBlogsIE,
CNNArticleIE,
)
CNNBlogsIE,
CNNArticleIE,
)
-from .co
llegehumor import CollegeHumor
IE
+from .co
ub import Coub
IE
from .collegerama import CollegeRamaIE
from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
from .comcarcoff import ComCarCoffIE
from .collegerama import CollegeRamaIE
from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
from .comcarcoff import ComCarCoffIE
@@
-227,6
+233,7
@@
from .everyonesmixtape import EveryonesMixtapeIE
from .exfm import ExfmIE
from .expotv import ExpoTVIE
from .extremetube import ExtremeTubeIE
from .exfm import ExfmIE
from .expotv import ExpoTVIE
from .extremetube import ExtremeTubeIE
+from .eyedotv import EyedoTVIE
from .facebook import FacebookIE
from .faz import FazIE
from .fc2 import FC2IE
from .facebook import FacebookIE
from .faz import FazIE
from .fc2 import FC2IE
@@
-239,6
+246,7
@@
from .fktv import FKTVIE
from .flickr import FlickrIE
from .folketinget import FolketingetIE
from .footyroom import FootyRoomIE
from .flickr import FlickrIE
from .folketinget import FolketingetIE
from .footyroom import FootyRoomIE
+from .formula1 import Formula1IE
from .fourtube import FourTubeIE
from .fox import FOXIE
from .foxgay import FoxgayIE
from .fourtube import FourTubeIE
from .fox import FOXIE
from .foxgay import FoxgayIE
@@
-366,6
+374,7
@@
from .kuwo import (
)
from .la7 import LA7IE
from .laola1tv import Laola1TvIE
)
from .la7 import LA7IE
from .laola1tv import Laola1TvIE
+from .learnr import LearnrIE
from .lecture2go import Lecture2GoIE
from .lemonde import LemondeIE
from .leeco import (
from .lecture2go import Lecture2GoIE
from .lemonde import LemondeIE
from .leeco import (
@@
-373,6
+382,7
@@
from .leeco import (
LePlaylistIE,
LetvCloudIE,
)
LePlaylistIE,
LetvCloudIE,
)
+from .libraryofcongress import LibraryOfCongressIE
from .libsyn import LibsynIE
from .lifenews import (
LifeNewsIE,
from .libsyn import LibsynIE
from .lifenews import (
LifeNewsIE,
@@
-383,6
+393,7
@@
from .limelight import (
LimelightChannelIE,
LimelightChannelListIE,
)
LimelightChannelIE,
LimelightChannelListIE,
)
+from .litv import LiTVIE
from .liveleak import LiveLeakIE
from .livestream import (
LivestreamIE,
from .liveleak import LiveLeakIE
from .livestream import (
LivestreamIE,
@@
-390,6
+401,7
@@
from .livestream import (
LivestreamShortenerIE,
)
from .lnkgo import LnkGoIE
LivestreamShortenerIE,
)
from .lnkgo import LnkGoIE
+from .localnews8 import LocalNews8IE
from .lovehomeporn import LoveHomePornIE
from .lrt import LRTIE
from .lynda import (
from .lovehomeporn import LoveHomePornIE
from .lrt import LRTIE
from .lynda import (
@@
-407,6
+419,10
@@
from .metacafe import MetacafeIE
from .metacritic import MetacriticIE
from .mgoon import MgoonIE
from .mgtv import MGTVIE
from .metacritic import MetacriticIE
from .mgoon import MgoonIE
from .mgtv import MGTVIE
+from .microsoftvirtualacademy import (
+ MicrosoftVirtualAcademyIE,
+ MicrosoftVirtualAcademyCourseIE,
+)
from .minhateca import MinhatecaIE
from .ministrygrid import MinistryGridIE
from .minoto import MinotoIE
from .minhateca import MinhatecaIE
from .ministrygrid import MinistryGridIE
from .minoto import MinotoIE
@@
-561,7
+577,10
@@
from .parliamentliveuk import ParliamentLiveUKIE
from .patreon import PatreonIE
from .pbs import PBSIE
from .people import PeopleIE
from .patreon import PatreonIE
from .pbs import PBSIE
from .people import PeopleIE
-from .periscope import PeriscopeIE
+from .periscope import (
+ PeriscopeIE,
+ PeriscopeUserIE,
+)
from .philharmoniedeparis import PhilharmonieDeParisIE
from .phoenix import PhoenixIE
from .photobucket import PhotobucketIE
from .philharmoniedeparis import PhilharmonieDeParisIE
from .phoenix import PhoenixIE
from .photobucket import PhotobucketIE
@@
-602,6
+621,10
@@
from .qqmusic import (
QQMusicPlaylistIE,
)
from .r7 import R7IE
QQMusicPlaylistIE,
)
from .r7 import R7IE
+from .radiocanada import (
+ RadioCanadaIE,
+ RadioCanadaAudioVideoIE,
+)
from .radiode import RadioDeIE
from .radiojavan import RadioJavanIE
from .radiobremen import RadioBremenIE
from .radiode import RadioDeIE
from .radiojavan import RadioJavanIE
from .radiobremen import RadioBremenIE
@@
-615,8
+638,12
@@
from .rds import RDSIE
from .redtube import RedTubeIE
from .regiotv import RegioTVIE
from .restudy import RestudyIE
from .redtube import RedTubeIE
from .regiotv import RegioTVIE
from .restudy import RestudyIE
+from .reuters import ReutersIE
from .reverbnation import ReverbNationIE
from .reverbnation import ReverbNationIE
-from .revision3 import Revision3IE
+from .revision3 import (
+ Revision3EmbedIE,
+ Revision3IE,
+)
from .rice import RICEIE
from .ringtv import RingTVIE
from .ro220 import Ro220IE
from .rice import RICEIE
from .ringtv import RingTVIE
from .ro220 import Ro220IE
@@
-655,7
+682,9
@@
from .screencast import ScreencastIE
from .screencastomatic import ScreencastOMaticIE
from .screenjunkies import ScreenJunkiesIE
from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
from .screencastomatic import ScreencastOMaticIE
from .screenjunkies import ScreenJunkiesIE
from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
+from .seeker import SeekerIE
from .senateisvp import SenateISVPIE
from .senateisvp import SenateISVPIE
+from .sendtonews import SendtoNewsIE
from .servingsys import ServingSysIE
from .sexu import SexuIE
from .shahid import ShahidIE
from .servingsys import ServingSysIE
from .sexu import SexuIE
from .shahid import ShahidIE
@@
-758,6
+787,7
@@
from .thesixtyone import TheSixtyOneIE
from .thestar import TheStarIE
from .thisamericanlife import ThisAmericanLifeIE
from .thisav import ThisAVIE
from .thestar import TheStarIE
from .thisamericanlife import ThisAmericanLifeIE
from .thisav import ThisAVIE
+from .threeqsdn import ThreeQSDNIE
from .tinypic import TinyPicIE
from .tlc import TlcDeIE
from .tmz import (
from .tinypic import TinyPicIE
from .tlc import TlcDeIE
from .tmz import (
@@
-810,7
+840,10
@@
from .tvc import (
)
from .tvigle import TvigleIE
from .tvland import TVLandIE
)
from .tvigle import TvigleIE
from .tvland import TVLandIE
-from .tvp import TvpIE, TvpSeriesIE
+from .tvp import (
+ TVPIE,
+ TVPSeriesIE,
+)
from .tvplay import TVPlayIE
from .tweakers import TweakersIE
from .twentyfourvideo import TwentyFourVideoIE
from .tvplay import TVPlayIE
from .tweakers import TweakersIE
from .twentyfourvideo import TwentyFourVideoIE
@@
-825,7
+858,6
@@
from .twitch import (
TwitchVodIE,
TwitchProfileIE,
TwitchPastBroadcastsIE,
TwitchVodIE,
TwitchProfileIE,
TwitchPastBroadcastsIE,
- TwitchBookmarksIE,
TwitchStreamIE,
)
from .twitter import (
TwitchStreamIE,
)
from .twitter import (
@@
-843,7
+875,10
@@
from .unistra import UnistraIE
from .urort import UrortIE
from .usatoday import USATodayIE
from .ustream import UstreamIE, UstreamChannelIE
from .urort import UrortIE
from .usatoday import USATodayIE
from .ustream import UstreamIE, UstreamChannelIE
-from .ustudio import UstudioIE
+from .ustudio import (
+ UstudioIE,
+ UstudioEmbedIE,
+)
from .varzesh3 import Varzesh3IE
from .vbox7 import Vbox7IE
from .veehd import VeeHDIE
from .varzesh3 import Varzesh3IE
from .vbox7 import Vbox7IE
from .veehd import VeeHDIE
@@
-875,6
+910,7
@@
from .videomore import (
)
from .videopremium import VideoPremiumIE
from .videott import VideoTtIE
)
from .videopremium import VideoPremiumIE
from .videott import VideoTtIE
+from .vidio import VidioIE
from .vidme import (
VidmeIE,
VidmeUserIE,
from .vidme import (
VidmeIE,
VidmeUserIE,
@@
-922,13
+958,15
@@
from .vube import VubeIE
from .vuclip import VuClipIE
from .vulture import VultureIE
from .walla import WallaIE
from .vuclip import VuClipIE
from .vulture import VultureIE
from .walla import WallaIE
-from .washingtonpost import WashingtonPostIE
+from .washingtonpost import (
+ WashingtonPostIE,
+ WashingtonPostArticleIE,
+)
from .wat import WatIE
from .watchindianporn import WatchIndianPornIE
from .wdr import (
WDRIE,
WDRMobileIE,
from .wat import WatIE
from .watchindianporn import WatchIndianPornIE
from .wdr import (
WDRIE,
WDRMobileIE,
- WDRMausIE,
)
from .webofstories import (
WebOfStoriesIE,
)
from .webofstories import (
WebOfStoriesIE,