projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/corone17/youtube-dl into corone17-patch-1
[youtube-dl]
/
youtube_dl
/
extractor
/
__init__.py
diff --git
a/youtube_dl/extractor/__init__.py
b/youtube_dl/extractor/__init__.py
index bd3c3193f6d0d0e0bccb0cc44e661b57de7e6783..aba62db53232e7ab9a90b3f7734999fcf5010bc4 100644
(file)
--- a/
youtube_dl/extractor/__init__.py
+++ b/
youtube_dl/extractor/__init__.py
@@
-144,7
+144,6
@@
from .ellentv import (
)
from .elpais import ElPaisIE
from .embedly import EmbedlyIE
)
from .elpais import ElPaisIE
from .embedly import EmbedlyIE
-from .empflix import EMPFlixIE
from .engadget import EngadgetIE
from .eporner import EpornerIE
from .eroprofile import EroProfileIE
from .engadget import EngadgetIE
from .eporner import EpornerIE
from .eroprofile import EroProfileIE
@@
-388,6
+387,7
@@
from .nytimes import (
from .nuvid import NuvidIE
from .odnoklassniki import OdnoklassnikiIE
from .oktoberfesttv import OktoberfestTVIE
from .nuvid import NuvidIE
from .odnoklassniki import OdnoklassnikiIE
from .oktoberfesttv import OktoberfestTVIE
+from .onionstudios import OnionStudiosIE
from .ooyala import (
OoyalaIE,
OoyalaExternalIE,
from .ooyala import (
OoyalaIE,
OoyalaExternalIE,
@@
-492,6
+492,10
@@
from .smotri import (
SmotriUserIE,
SmotriBroadcastIE,
)
SmotriUserIE,
SmotriBroadcastIE,
)
+from .snagfilms import (
+ SnagFilmsIE,
+ SnagFilmsEmbedIE,
+)
from .snotr import SnotrIE
from .sohu import SohuIE
from .soompi import (
from .snotr import SnotrIE
from .sohu import SohuIE
from .soompi import (
@@
-565,6
+569,7
@@
from .tf1 import TF1IE
from .theonion import TheOnionIE
from .theplatform import ThePlatformIE
from .thesixtyone import TheSixtyOneIE
from .theonion import TheOnionIE
from .theplatform import ThePlatformIE
from .thesixtyone import TheSixtyOneIE
+from .thisamericanlife import ThisAmericanLifeIE
from .thisav import ThisAVIE
from .tinypic import TinyPicIE
from .tlc import TlcIE, TlcDeIE
from .thisav import ThisAVIE
from .tinypic import TinyPicIE
from .tlc import TlcIE, TlcDeIE
@@
-572,7
+577,11
@@
from .tmz import (
TMZIE,
TMZArticleIE,
)
TMZIE,
TMZArticleIE,
)
-from .tnaflix import TNAFlixIE
+from .tnaflix import (
+ TNAFlixIE,
+ EMPFlixIE,
+ MovieFapIE,
+)
from .thvideo import (
THVideoIE,
THVideoPlaylistIE
from .thvideo import (
THVideoIE,
THVideoPlaylistIE
@@
-616,6
+625,7
@@
from .twitch import (
TwitchBookmarksIE,
TwitchStreamIE,
)
TwitchBookmarksIE,
TwitchStreamIE,
)
+from .twitter import TwitterCardIE
from .ubu import UbuIE
from .udemy import (
UdemyIE,
from .ubu import UbuIE
from .udemy import (
UdemyIE,
@@
-701,7
+711,10
@@
from .wrzuta import WrzutaIE
from .wsj import WSJIE
from .xbef import XBefIE
from .xboxclips import XboxClipsIE
from .wsj import WSJIE
from .xbef import XBefIE
from .xboxclips import XboxClipsIE
-from .xhamster import XHamsterIE
+from .xhamster import (
+ XHamsterIE,
+ XHamsterEmbedIE,
+)
from .xminus import XMinusIE
from .xnxx import XNXXIE
from .xstream import XstreamIE
from .xminus import XMinusIE
from .xnxx import XNXXIE
from .xstream import XstreamIE