Merge branch 'crooksandliars' of https://github.com/fstirlitz/youtube-dl into fstirli...

diff --combined youtube_dl/extractor/__init__.py
index 8df1db83ec00337f1119de19d000ec3826c50419,dc272af8268cf8c5f86d050e3ea4fba5ad979e28..894aa5b43f60ab481787f17038c1723dda4322e5
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -90,6 -90,7 +90,7 @@@ from .commonmistakes import CommonMista
  from .condenast import CondeNastIE
  from .cracked import CrackedIE
  from .criterion import CriterionIE
+ from .crooksandliars import CrooksAndLiarsIE, CrooksAndLiarsArticleIE
  from .crunchyroll import (
      CrunchyrollIE,
      CrunchyrollShowPlaylistIE
@@@ -106,7 -107,6 +107,7 @@@ from .dbtv import DBTVI
  from .dctp import DctpTvIE
  from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
 +from .dhm import DHMIE
  from .dotsub import DotsubIE
  from .douyutv import DouyuTVIE
  from .dreisat import DreiSatIE
@@@ -115,7 -115,6 +116,7 @@@ from .drtuber import DrTuberI
  from .drtv import DRTVIE
  from .dvtv import DVTVIE
  from .dump import DumpIE
 +from .dumpert import DumpertIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
@@@ -177,7 -176,6 +178,7 @@@ from .gameone import 
      GameOneIE,
      GameOnePlaylistIE,
  )
 +from .gamersyde import GamersydeIE
  from .gamespot import GameSpotIE
  from .gamestar import GameStarIE
  from .gametrailers import GametrailersIE
@@@ -253,7 -251,6 +254,7 @@@ from .letv import 
      LetvTvIE,
      LetvPlaylistIE
  )
 +from .libsyn import LibsynIE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
  from .livestream import (
@@@ -277,7 -274,6 +278,7 @@@ from .metacritic import MetacriticI
  from .mgoon import MgoonIE
  from .minhateca import MinhatecaIE
  from .ministrygrid import MinistryGridIE
 +from .miomio import MioMioIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mitele import MiTeleIE
  from .mixcloud import MixcloudIE
@@@ -313,8 -309,6 +314,8 @@@ from .nba import NBAI
  from .nbc import (
      NBCIE,
      NBCNewsIE,
 +    NBCSportsIE,
 +    NBCSportsVPlayerIE,
  )
  from .ndr import NDRIE
  from .ndtv import NDTVIE
@@@ -353,7 -347,6 +354,7 @@@ from .npo import 
  )
  from .nrk import (
      NRKIE,
 +    NRKPlaylistIE,
      NRKTVIE,
  )
  from .ntvde import NTVDeIE
@@@ -388,7 -381,6 +389,7 @@@ from .pornhub import 
      PornHubPlaylistIE,
  )
  from .pornotube import PornotubeIE
 +from .pornovoisines import PornoVoisinesIE
  from .pornoxo import PornoXOIE
  from .primesharetv import PrimeShareTVIE
  from .promptfile import PromptFileIE
@@@ -398,7 -390,6 +399,7 @@@ from .pyvideo import PyvideoI
  from .quickvid import QuickVidIE
  from .r7 import R7IE
  from .radiode import RadioDeIE
 +from .radiojavan import RadioJavanIE
  from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
  from .rai import RaiIE
@@@ -428,10 -419,6 +429,10 @@@ from .rutube import 
  )
  from .rutv import RUTVIE
  from .sandia import SandiaIE
 +from .safari import (
 +    SafariIE,
 +    SafariCourseIE,
 +)
  from .sapo import SapoIE
  from .savefrom import SaveFromIE
  from .sbs import SBSIE
@@@ -471,7 -458,6 +472,7 @@@ from .southpark import 
      SouthparkDeIE,
  )
  from .space import SpaceIE
 +from .spankbang import SpankBangIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
@@@ -539,10 -525,6 +540,10 @@@ from .tvp import TvpIE, TvpSeriesI
  from .tvplay import TVPlayIE
  from .tweakers import TweakersIE
  from .twentyfourvideo import TwentyFourVideoIE
 +from .twentytwotracks import (
 +    TwentyTwoTracksIE,
 +    TwentyTwoTracksGenreIE
 +)
  from .twitch import (
      TwitchVideoIE,
      TwitchChapterIE,
@@@ -557,16 -539,13 +558,16 @@@ from .udemy import 
      UdemyIE,
      UdemyCourseIE
  )
 +from .udn import UDNEmbedIE
  from .ultimedia import UltimediaIE
  from .unistra import UnistraIE
  from .urort import UrortIE
  from .ustream import UstreamIE, UstreamChannelIE
 +from .varzesh3 import Varzesh3IE
  from .vbox7 import Vbox7IE
  from .veehd import VeeHDIE
  from .veoh import VeohIE
 +from .vessel import VesselIE
  from .vesti import VestiIE
  from .vevo import VevoIE
  from .vgtv import VGTVIE