New upstream version 2020.05.08

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 1cab440f46e9733e6182563b36a464d77b3610c7..4b3092028f46fbfbb7ac8a64d43d10c1d1eff148 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -105,6 +105,7 @@ from .bilibili import (
     BiliBiliBangumiIE,
     BilibiliAudioIE,
     BilibiliAudioAlbumIE,
     BiliBiliBangumiIE,
     BilibiliAudioIE,
     BilibiliAudioAlbumIE,

+    BiliBiliPlayerIE,

 )
 from .biobiochiletv import BioBioChileTVIE
 from .bitchute import (
 )
 from .biobiochiletv import BioBioChileTVIE
 from .bitchute import (


@@ -497,7 +498,6 @@ from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .joj import JojIE
 from .jwplatform import JWPlatformIE
 from .jove import JoveIE
 from .joj import JojIE
 from .jwplatform import JWPlatformIE

-from .jpopsukitv import JpopsukiIE

 from .kakao import KakaoIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE


@@ -636,7 +636,10 @@ from .mixcloud import (
 from .mlb import MLBIE
 from .mnet import MnetIE
 from .moevideo import MoeVideoIE
 from .mlb import MLBIE
 from .mnet import MnetIE
 from .moevideo import MoeVideoIE

-from .mofosex import MofosexIE
+from .mofosex import (
+    MofosexIE,
+    MofosexEmbedIE,
+)

 from .mojvideo import MojvideoIE
 from .morningstar import MorningstarIE
 from .motherless import (
 from .mojvideo import MojvideoIE
 from .morningstar import MorningstarIE
 from .motherless import (


@@ -801,6 +804,16 @@ from .orf import (
     ORFFM4IE,
     ORFFM4StoryIE,
     ORFOE1IE,
     ORFFM4IE,
     ORFFM4StoryIE,
     ORFOE1IE,

+    ORFOE3IE,
+    ORFNOEIE,
+    ORFWIEIE,
+    ORFBGLIE,
+    ORFOOEIE,
+    ORFSTMIE,
+    ORFKTNIE,
+    ORFSBGIE,
+    ORFTIRIE,
+    ORFVBGIE,

     ORFIPTVIE,
 )
 from .outsidetv import OutsideTVIE
     ORFIPTVIE,
 )
 from .outsidetv import OutsideTVIE


@@ -850,6 +863,7 @@ from .polskieradio import (
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )

+from .popcorntimes import PopcorntimesIE

 from .popcorntv import PopcornTVIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .popcorntv import PopcornTVIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE