d/rules: Drop makefile mangling

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index b1ed8a4b2dbbe33f35832d901d21f58a0f34a3a6..44120cae25e386a632f33d621a81ba0520e0f738 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -58,17 +58,8 @@ from .ard import (
     ARDMediathekIE,
 )
 from .arte import (
     ARDMediathekIE,
 )
 from .arte import (

-    ArteTvIE,

     ArteTVPlus7IE,
     ArteTVPlus7IE,

-    ArteTVCreativeIE,
-    ArteTVConcertIE,
-    ArteTVInfoIE,
-    ArteTVFutureIE,
-    ArteTVCinemaIE,
-    ArteTVDDCIE,
-    ArteTVMagazineIE,

     ArteTVEmbedIE,
     ArteTVEmbedIE,

-    TheOperaPlatformIE,

     ArteTVPlaylistIE,
 )
 from .asiancrush import (
     ArteTVPlaylistIE,
 )
 from .asiancrush import (


@@ -113,6 +104,8 @@ from .bild import BildIE
 from .bilibili import (
     BiliBiliIE,
     BiliBiliBangumiIE,
 from .bilibili import (
     BiliBiliIE,
     BiliBiliBangumiIE,

+    BilibiliAudioIE,
+    BilibiliAudioAlbumIE,

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


@@ -404,11 +397,7 @@ from .frontendmasters import (
     FrontendMastersCourseIE
 )
 from .funimation import FunimationIE
     FrontendMastersCourseIE
 )
 from .funimation import FunimationIE

-from .funk import (
-    FunkMixIE,
-    FunkChannelIE,
-)
-from .funnyordie import FunnyOrDieIE
+from .funk import FunkIE

 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .gaia import GaiaIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .gaia import GaiaIE


@@ -592,6 +581,7 @@ from .linkedin import (
 )
 from .linuxacademy import LinuxAcademyIE
 from .litv import LiTVIE
 )
 from .linuxacademy import LinuxAcademyIE
 from .litv import LiTVIE

+from .livejournal import LiveJournalIE

 from .liveleak import (
     LiveLeakIE,
     LiveLeakEmbedIE,
 from .liveleak import (
     LiveLeakIE,
     LiveLeakEmbedIE,


@@ -745,7 +735,6 @@ from .nexx import (
     NexxIE,
     NexxEmbedIE,
 )
     NexxIE,
     NexxEmbedIE,
 )

-from .nfb import NFBIE

 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nhl import NHLIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nhl import NHLIE


@@ -892,8 +881,9 @@ from .porncom import PornComIE
 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,
 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,

-    PornHubPlaylistIE,
-    PornHubUserVideosIE,
+    PornHubUserIE,
+    PornHubPagedVideoListIE,
+    PornHubUserVideosUploadIE,

 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE


@@ -980,7 +970,6 @@ from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 from .rtvs import RTVSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 from .rtvs import RTVSIE

-from .rudo import RudoIE

 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,
 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,


@@ -1268,6 +1257,10 @@ from .udn import UDNEmbedIE
 from .ufctv import UFCTVIE
 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE
 from .ufctv import UFCTVIE
 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE

+from .dlive import (
+    DLiveVODIE,
+    DLiveStreamIE,
+)

 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE
 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE


@@ -1434,6 +1427,7 @@ from .xfileshare import XFileShareIE
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,

+    XHamsterUserIE,

 )
 from .xiami import (
     XiamiSongIE,
 )
 from .xiami import (
     XiamiSongIE,


@@ -1457,6 +1451,7 @@ from .yahoo import (
     YahooSearchIE,
     YahooGyaOPlayerIE,
     YahooGyaOIE,
     YahooSearchIE,
     YahooGyaOPlayerIE,
     YahooGyaOIE,

+    YahooJapanNewsIE,

 )
 from .yandexdisk import YandexDiskIE
 from .yandexmusic import (
 )
 from .yandexdisk import YandexDiskIE
 from .yandexmusic import (