Merge branch 'kuwo' of https://github.com/ping/youtube-dl into ping-kuwo

diff --combined youtube_dl/extractor/__init__.py
index d886f7d68bce176bf641dd79445ef09b690cde7e,a348b307720004672de3c424bf921630464891e4..cc86835733c2839c7229427694013419c6feea92
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -4,10 -4,7 +4,10 @@@ from .abc import ABCI
  from .abc7news import Abc7NewsIE
  from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
 -from .adobetv import AdobeTVIE
 +from .adobetv import (
 +    AdobeTVIE,
 +    AdobeTVVideoIE,
 +)
  from .adultswim import AdultSwimIE
  from .aftenposten import AftenpostenIE
  from .aftonbladet import AftonbladetIE
@@@ -106,7 -103,6 +106,7 @@@ from .dailymotion import 
      DailymotionIE,
      DailymotionPlaylistIE,
      DailymotionUserIE,
 +    DailymotionCloudIE,
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
@@@ -144,6 -140,7 +144,6 @@@ from .ellentv import 
  )
  from .elpais import ElPaisIE
  from .embedly import EmbedlyIE
 -from .empflix import EMPFlixIE
  from .engadget import EngadgetIE
  from .eporner import EpornerIE
  from .eroprofile import EroProfileIE
@@@ -260,6 -257,14 +260,14 @@@ from .keek import KeekI
  from .kontrtube import KontrTubeIE
  from .krasview import KrasViewIE
  from .ku6 import Ku6IE
+ from .kuwo import (
+     KuwoIE,
+     KuwoAlbumIE,
+     KuwoChartIE,
+     KuwoSingerIE,
+     KuwoCategoryIE,
+     KuwoMvIE,
+ )
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
  from .letv import (
@@@ -323,7 -328,6 +331,7 @@@ from .musicvault import MusicVaultI
  from .muzu import MuzuTVIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
 +from .myvi import MyviIE
  from .myvideo import MyVideoIE
  from .myvidster import MyVidsterIE
  from .nationalgeographic import NationalGeographicIE
@@@ -343,15 -347,6 +351,15 @@@ from .ndtv import NDTVI
  from .netzkino import NetzkinoIE
  from .nerdcubed import NerdCubedFeedIE
  from .nerdist import NerdistIE
 +from .neteasemusic import (
 +    NetEaseMusicIE,
 +    NetEaseMusicAlbumIE,
 +    NetEaseMusicSingerIE,
 +    NetEaseMusicListIE,
 +    NetEaseMusicMvIE,
 +    NetEaseMusicProgramIE,
 +    NetEaseMusicDjRadioIE,
 +)
  from .newgrounds import NewgroundsIE
  from .newstube import NewstubeIE
  from .nextmedia import (
@@@ -397,7 -392,6 +405,7 @@@ from .nytimes import 
  from .nuvid import NuvidIE
  from .odnoklassniki import OdnoklassnikiIE
  from .oktoberfesttv import OktoberfestTVIE
 +from .onionstudios import OnionStudiosIE
  from .ooyala import (
      OoyalaIE,
      OoyalaExternalIE,
@@@ -415,7 -409,6 +423,7 @@@ from .pbs import PBSI
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
 +from .pinkbike import PinkbikeIE
  from .planetaplay import PlanetaPlayIE
  from .pladform import PladformIE
  from .played import PlayedIE
@@@ -442,7 -435,6 +450,7 @@@ from .qqmusic import 
      QQMusicSingerIE,
      QQMusicAlbumIE,
      QQMusicToplistIE,
 +    QQMusicPlaylistIE,
  )
  from .quickvid import QuickVidIE
  from .r7 import R7IE
@@@ -503,10 -495,6 +511,10 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snagfilms import (
 +    SnagFilmsIE,
 +    SnagFilmsEmbedIE,
 +)
  from .snotr import SnotrIE
  from .sohu import SohuIE
  from .soompi import (
@@@ -580,7 -568,6 +588,7 @@@ from .tf1 import TF1I
  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
@@@ -588,11 -575,7 +596,11 @@@ from .tmz import 
      TMZIE,
      TMZArticleIE,
  )
 -from .tnaflix import TNAFlixIE
 +from .tnaflix import (
 +    TNAFlixIE,
 +    EMPFlixIE,
 +    MovieFapIE,
 +)
  from .thvideo import (
      THVideoIE,
      THVideoPlaylistIE
@@@ -636,7 -619,6 +644,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 +from .twitter import TwitterCardIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -722,10 -704,7 +730,10 @@@ from .wrzuta import WrzutaI
  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
@@@ -744,7 -723,6 +752,7 @@@ from .yandexmusic import 
      YandexMusicPlaylistIE,
  )
  from .yesjapan import YesJapanIE
 +from .yinyuetai import YinYueTaiIE
  from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE