projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'karrierevideos' of https://github.com/misterhat/youtube-dl into misterh...
[youtube-dl]
/
youtube_dl
/
extractor
/
__init__.py
diff --git
a/youtube_dl/extractor/__init__.py
b/youtube_dl/extractor/__init__.py
index d131d3ec31645e30611be62180d95e488ebbdcc6..79bcd910666baf7a9802dc50f7ae072827976b52 100644
(file)
--- a/
youtube_dl/extractor/__init__.py
+++ b/
youtube_dl/extractor/__init__.py
@@
-339,8
+339,7
@@
from .newstube import NewstubeIE
from .nextmedia import (
NextMediaIE,
NextMediaActionNewsIE,
from .nextmedia import (
NextMediaIE,
NextMediaActionNewsIE,
- AppleDailyRealtimeNewsIE,
- AppleDailyAnimationNewsIE
+ AppleDailyIE,
)
from .nfb import NFBIE
from .nfl import NFLIE
)
from .nfb import NFBIE
from .nfl import NFLIE
@@
-573,7
+572,10
@@
from .tumblr import TumblrIE
from .tunein import TuneInIE
from .turbo import TurboIE
from .tutv import TutvIE
from .tunein import TuneInIE
from .turbo import TurboIE
from .tutv import TutvIE
-from .tv2 import TV2IE
+from .tv2 import (
+ TV2IE,
+ TV2ArticleIE,
+)
from .tv4 import TV4IE
from .tvigle import TvigleIE
from .tvp import TvpIE, TvpSeriesIE
from .tv4 import TV4IE
from .tvigle import TvigleIE
from .tvp import TvpIE, TvpSeriesIE
@@
-645,7
+647,10
@@
from .vine import (
VineIE,
VineUserIE,
)
VineIE,
VineUserIE,
)
-from .viki import VikiIE
+from .viki import (
+ VikiIE,
+ VikiChannelIE,
+)
from .vk import (
VKIE,
VKUserVideosIE,
from .vk import (
VKIE,
VKUserVideosIE,