From 36d6deead1eaa6f420477ac2b925205a99336b41 Mon Sep 17 00:00:00 2001 From: Entropy <0fiscalentropy@users.noreply.github.com> Date: Sat, 28 Jan 2017 21:25:04 +0100 Subject: [PATCH] [refactor] sort import statements --- youtube_dl/extractor/abc.py | 7 +- youtube_dl/extractor/abcnews.py | 2 +- youtube_dl/extractor/abcotvs.py | 5 +- youtube_dl/extractor/acast.py | 10 +- youtube_dl/extractor/addanime.py | 7 +- youtube_dl/extractor/adobepass.py | 9 +- youtube_dl/extractor/adobetv.py | 12 +- youtube_dl/extractor/adultswim.py | 5 +- youtube_dl/extractor/aenetworks.py | 12 +- youtube_dl/extractor/afreecatv.py | 7 +- youtube_dl/extractor/airmozilla.py | 6 +- youtube_dl/extractor/allocine.py | 6 +- youtube_dl/extractor/alphaporno.py | 7 +- youtube_dl/extractor/amcnetworks.py | 6 +- youtube_dl/extractor/amp.py | 7 +- youtube_dl/extractor/animeondemand.py | 9 +- youtube_dl/extractor/anvato.py | 4 +- youtube_dl/extractor/anysex.py | 5 +- youtube_dl/extractor/aol.py | 5 +- youtube_dl/extractor/aparat.py | 5 +- youtube_dl/extractor/appleconnect.py | 5 +- youtube_dl/extractor/appletrailers.py | 10 +- youtube_dl/extractor/archiveorg.py | 5 +- youtube_dl/extractor/ard.py | 12 +- youtube_dl/extractor/arkena.py | 4 +- youtube_dl/extractor/arte.py | 12 +- youtube_dl/extractor/atresplayer.py | 6 +- youtube_dl/extractor/atttechchannel.py | 2 +- youtube_dl/extractor/audimedia.py | 6 +- youtube_dl/extractor/audioboom.py | 2 +- youtube_dl/extractor/audiomack.py | 7 +- youtube_dl/extractor/awaan.py | 9 +- youtube_dl/extractor/azmedien.py | 5 +- youtube_dl/extractor/azubu.py | 6 +- youtube_dl/extractor/baidu.py | 2 +- youtube_dl/extractor/bambuser.py | 4 +- youtube_dl/extractor/bandcamp.py | 7 +- youtube_dl/extractor/bbc.py | 12 +- youtube_dl/extractor/beampro.py | 2 +- youtube_dl/extractor/beatport.py | 2 +- youtube_dl/extractor/beeg.py | 11 +- youtube_dl/extractor/behindkink.py | 2 +- youtube_dl/extractor/bet.py | 2 +- youtube_dl/extractor/bigflix.py | 2 +- youtube_dl/extractor/bild.py | 5 +- youtube_dl/extractor/bilibili.py | 4 +- youtube_dl/extractor/biobiochiletv.py | 5 +- youtube_dl/extractor/bleacherreport.py | 8 +- youtube_dl/extractor/blinkx.py | 5 +- youtube_dl/extractor/bokecc.py | 2 +- youtube_dl/extractor/bpb.py | 5 +- youtube_dl/extractor/br.py | 2 +- youtube_dl/extractor/bravotv.py | 6 +- youtube_dl/extractor/breakcom.py | 7 +- youtube_dl/extractor/brightcove.py | 14 +- youtube_dl/extractor/byutv.py | 2 +- youtube_dl/extractor/c56.py | 2 +- youtube_dl/extractor/camdemy.py | 12 +- youtube_dl/extractor/camwithher.py | 6 +- youtube_dl/extractor/canalc2.py | 2 +- youtube_dl/extractor/canalplus.py | 4 +- youtube_dl/extractor/canvas.py | 2 +- youtube_dl/extractor/carambatv.py | 9 +- youtube_dl/extractor/cbc.py | 14 +- youtube_dl/extractor/cbs.py | 6 +- youtube_dl/extractor/cbsinteractive.py | 2 +- youtube_dl/extractor/cbslocal.py | 7 +- youtube_dl/extractor/cbsnews.py | 6 +- youtube_dl/extractor/ccc.py | 5 +- youtube_dl/extractor/ccma.py | 7 +- youtube_dl/extractor/cctv.py | 8 +- youtube_dl/extractor/cda.py | 7 +- youtube_dl/extractor/ceskatelevize.py | 7 +- youtube_dl/extractor/channel9.py | 6 +- youtube_dl/extractor/charlierose.py | 2 +- youtube_dl/extractor/chaturbate.py | 2 +- youtube_dl/extractor/chilloutzone.py | 7 +- youtube_dl/extractor/chirbit.py | 2 +- youtube_dl/extractor/cinchcast.py | 5 +- youtube_dl/extractor/clipfish.py | 5 +- youtube_dl/extractor/cliphunter.py | 3 +- youtube_dl/extractor/clipsyndicate.py | 5 +- youtube_dl/extractor/cloudy.py | 11 +- youtube_dl/extractor/clubic.py | 5 +- youtube_dl/extractor/clyp.py | 5 +- youtube_dl/extractor/cnbc.py | 2 +- youtube_dl/extractor/cnn.py | 2 +- youtube_dl/extractor/collegerama.py | 6 +- youtube_dl/extractor/comcarcoff.py | 8 +- youtube_dl/extractor/comedycentral.py | 2 +- youtube_dl/extractor/common.py | 24 +- youtube_dl/extractor/commonmistakes.py | 2 +- youtube_dl/extractor/commonprotocols.py | 4 +- youtube_dl/extractor/condenast.py | 15 +- youtube_dl/extractor/coub.py | 2 +- youtube_dl/extractor/cracked.py | 5 +- youtube_dl/extractor/crackle.py | 4 +- youtube_dl/extractor/crooksandliars.py | 5 +- youtube_dl/extractor/crunchyroll.py | 18 +- youtube_dl/extractor/cspan.py | 12 +- youtube_dl/extractor/ctsnews.py | 2 +- youtube_dl/extractor/ctvnews.py | 2 +- youtube_dl/extractor/cultureunplugged.py | 5 +- youtube_dl/extractor/curiositystream.py | 7 +- youtube_dl/extractor/cwtv.py | 5 +- youtube_dl/extractor/dailymail.py | 6 +- youtube_dl/extractor/dailymotion.py | 11 +- youtube_dl/extractor/daum.py | 11 +- youtube_dl/extractor/dctp.py | 2 +- youtube_dl/extractor/deezer.py | 6 +- youtube_dl/extractor/democracynow.py | 9 +- youtube_dl/extractor/dfb.py | 2 +- youtube_dl/extractor/dhm.py | 2 +- youtube_dl/extractor/digiteka.py | 2 +- youtube_dl/extractor/discovery.py | 7 +- youtube_dl/extractor/discoverygo.py | 4 +- youtube_dl/extractor/disney.py | 7 +- youtube_dl/extractor/dispeak.py | 2 +- youtube_dl/extractor/dotsub.py | 5 +- youtube_dl/extractor/douyutv.py | 10 +- youtube_dl/extractor/dplay.py | 8 +- youtube_dl/extractor/dramafever.py | 9 +- youtube_dl/extractor/drbonanza.py | 5 +- youtube_dl/extractor/dreisat.py | 10 +- youtube_dl/extractor/dropbox.py | 2 +- youtube_dl/extractor/drtuber.py | 5 +- youtube_dl/extractor/drtv.py | 4 +- youtube_dl/extractor/dumpert.py | 5 +- youtube_dl/extractor/dvtv.py | 6 +- youtube_dl/extractor/dw.py | 7 +- youtube_dl/extractor/eagleplatform.py | 10 +- youtube_dl/extractor/ehow.py | 2 +- youtube_dl/extractor/eighttracks.py | 8 +- youtube_dl/extractor/einthusan.py | 7 +- youtube_dl/extractor/eitb.py | 2 +- youtube_dl/extractor/ellentv.py | 5 +- youtube_dl/extractor/elpais.py | 2 +- youtube_dl/extractor/embedly.py | 2 +- youtube_dl/extractor/eporner.py | 4 +- youtube_dl/extractor/eroprofile.py | 7 +- youtube_dl/extractor/escapist.py | 6 +- youtube_dl/extractor/espn.py | 8 +- youtube_dl/extractor/esri.py | 8 +- youtube_dl/extractor/europa.py | 4 +- youtube_dl/extractor/everyonesmixtape.py | 5 +- youtube_dl/extractor/expotv.py | 5 +- youtube_dl/extractor/extractors.py | 779 +++++------------- youtube_dl/extractor/eyedotv.py | 6 +- youtube_dl/extractor/facebook.py | 8 +- youtube_dl/extractor/faz.py | 6 +- youtube_dl/extractor/fc2.py | 12 +- youtube_dl/extractor/fczenit.py | 2 +- youtube_dl/extractor/firsttv.py | 11 +- youtube_dl/extractor/fivetv.py | 2 +- youtube_dl/extractor/fktv.py | 6 +- youtube_dl/extractor/flickr.py | 8 +- youtube_dl/extractor/flipagram.py | 9 +- youtube_dl/extractor/folketinget.py | 9 +- youtube_dl/extractor/fourtube.py | 2 +- youtube_dl/extractor/fox.py | 5 +- youtube_dl/extractor/fox9.py | 2 +- youtube_dl/extractor/foxgay.py | 5 +- youtube_dl/extractor/foxsports.py | 5 +- youtube_dl/extractor/franceculture.py | 5 +- youtube_dl/extractor/franceinter.py | 2 +- youtube_dl/extractor/francetv.py | 13 +- youtube_dl/extractor/freesound.py | 2 +- youtube_dl/extractor/freespeech.py | 2 +- youtube_dl/extractor/funimation.py | 11 +- youtube_dl/extractor/funnyordie.py | 2 +- youtube_dl/extractor/fxnetworks.py | 4 +- youtube_dl/extractor/gameone.py | 7 +- youtube_dl/extractor/gamersyde.py | 6 +- youtube_dl/extractor/gamespot.py | 10 +- youtube_dl/extractor/gamestar.py | 5 +- youtube_dl/extractor/gdcvault.py | 6 +- youtube_dl/extractor/generic.py | 100 ++- youtube_dl/extractor/gfycat.py | 7 +- youtube_dl/extractor/giantbomb.py | 8 +- youtube_dl/extractor/giga.py | 4 +- youtube_dl/extractor/globo.py | 10 +- youtube_dl/extractor/go.py | 6 +- youtube_dl/extractor/godtube.py | 5 +- youtube_dl/extractor/godtv.py | 2 +- youtube_dl/extractor/golem.py | 8 +- youtube_dl/extractor/googledrive.py | 5 +- youtube_dl/extractor/googleplus.py | 4 +- youtube_dl/extractor/goshgay.py | 8 +- youtube_dl/extractor/hbo.py | 7 +- youtube_dl/extractor/hearthisat.py | 4 +- youtube_dl/extractor/heise.py | 6 +- youtube_dl/extractor/hellporno.py | 6 +- youtube_dl/extractor/helsinki.py | 2 +- youtube_dl/extractor/hgtv.py | 6 +- youtube_dl/extractor/historicfilms.py | 2 +- youtube_dl/extractor/hitbox.py | 8 +- youtube_dl/extractor/hitrecord.py | 9 +- youtube_dl/extractor/hornbunny.py | 5 +- youtube_dl/extractor/hotnewhiphop.py | 2 +- youtube_dl/extractor/hotstar.py | 6 +- youtube_dl/extractor/howcast.py | 2 +- youtube_dl/extractor/howstuffworks.py | 4 +- youtube_dl/extractor/hrti.py | 4 +- youtube_dl/extractor/huajiao.py | 5 +- youtube_dl/extractor/huffpost.py | 6 +- youtube_dl/extractor/hypem.py | 7 +- youtube_dl/extractor/iconosquare.py | 6 +- youtube_dl/extractor/ign.py | 5 +- youtube_dl/extractor/imdb.py | 6 +- youtube_dl/extractor/imgur.py | 9 +- youtube_dl/extractor/indavideo.py | 6 +- youtube_dl/extractor/instagram.py | 2 +- youtube_dl/extractor/internetvideoarchive.py | 11 +- youtube_dl/extractor/iprima.py | 6 +- youtube_dl/extractor/iqiyi.py | 11 +- youtube_dl/extractor/ir90tv.py | 2 +- youtube_dl/extractor/itv.py | 16 +- youtube_dl/extractor/ivi.py | 8 +- youtube_dl/extractor/ivideon.py | 7 +- youtube_dl/extractor/iwara.py | 2 +- youtube_dl/extractor/izlesene.py | 2 +- youtube_dl/extractor/jamendo.py | 2 +- youtube_dl/extractor/jove.py | 5 +- youtube_dl/extractor/jpopsukitv.py | 5 +- youtube_dl/extractor/jwplatform.py | 2 +- youtube_dl/extractor/kaltura.py | 13 +- youtube_dl/extractor/kamcord.py | 7 +- youtube_dl/extractor/kanalplay.py | 6 +- youtube_dl/extractor/kankan.py | 2 +- youtube_dl/extractor/karrierevideos.py | 4 +- youtube_dl/extractor/keezmovies.py | 9 +- youtube_dl/extractor/khanacademy.py | 4 +- youtube_dl/extractor/kickstarter.py | 2 +- youtube_dl/extractor/konserthusetplay.py | 8 +- youtube_dl/extractor/kontrtube.py | 5 +- youtube_dl/extractor/krasview.py | 5 +- youtube_dl/extractor/kusi.py | 4 +- youtube_dl/extractor/kuwo.py | 6 +- youtube_dl/extractor/la7.py | 5 +- youtube_dl/extractor/laola1tv.py | 6 +- youtube_dl/extractor/lcp.py | 2 +- youtube_dl/extractor/lecture2go.py | 4 +- youtube_dl/extractor/leeco.py | 12 +- youtube_dl/extractor/lego.py | 8 +- youtube_dl/extractor/libraryofcongress.py | 8 +- youtube_dl/extractor/libsyn.py | 2 +- youtube_dl/extractor/lifenews.py | 9 +- youtube_dl/extractor/limelight.py | 6 +- youtube_dl/extractor/litv.py | 7 +- youtube_dl/extractor/liveleak.py | 2 +- youtube_dl/extractor/livestream.py | 27 +- youtube_dl/extractor/lnkgo.py | 5 +- youtube_dl/extractor/lrt.py | 7 +- youtube_dl/extractor/lynda.py | 12 +- youtube_dl/extractor/macgamestore.py | 2 +- youtube_dl/extractor/mailru.py | 5 +- youtube_dl/extractor/mangomolo.py | 6 +- youtube_dl/extractor/matchtv.py | 2 +- youtube_dl/extractor/mdr.py | 2 +- youtube_dl/extractor/meipai.py | 6 +- youtube_dl/extractor/melonvod.py | 5 +- youtube_dl/extractor/meta.py | 6 +- youtube_dl/extractor/metacafe.py | 13 +- youtube_dl/extractor/metacritic.py | 4 +- youtube_dl/extractor/mgoon.py | 6 +- youtube_dl/extractor/mgtv.py | 2 +- .../extractor/microsoftvirtualacademy.py | 6 +- youtube_dl/extractor/minhateca.py | 2 +- youtube_dl/extractor/ministrygrid.py | 5 +- youtube_dl/extractor/minoto.py | 2 +- youtube_dl/extractor/miomio.py | 9 +- youtube_dl/extractor/mit.py | 8 +- youtube_dl/extractor/mitele.py | 14 +- youtube_dl/extractor/mixcloud.py | 9 +- youtube_dl/extractor/mlb.py | 5 +- youtube_dl/extractor/mnet.py | 6 +- youtube_dl/extractor/moevideo.py | 2 +- youtube_dl/extractor/mofosex.py | 6 +- youtube_dl/extractor/mojvideo.py | 5 +- youtube_dl/extractor/moniker.py | 2 +- youtube_dl/extractor/motherless.py | 6 +- youtube_dl/extractor/motorsport.py | 4 +- youtube_dl/extractor/movieclips.py | 7 +- youtube_dl/extractor/movingimage.py | 5 +- youtube_dl/extractor/mpora.py | 2 +- youtube_dl/extractor/msn.py | 9 +- youtube_dl/extractor/mtv.py | 11 +- youtube_dl/extractor/muenchentv.py | 6 +- youtube_dl/extractor/musicplayon.py | 8 +- youtube_dl/extractor/mwave.py | 7 +- youtube_dl/extractor/myspace.py | 6 +- youtube_dl/extractor/myspass.py | 9 +- youtube_dl/extractor/myvideo.py | 11 +- youtube_dl/extractor/nationalgeographic.py | 12 +- youtube_dl/extractor/naver.py | 6 +- youtube_dl/extractor/nba.py | 10 +- youtube_dl/extractor/nbc.py | 4 +- youtube_dl/extractor/ndr.py | 7 +- youtube_dl/extractor/ndtv.py | 6 +- youtube_dl/extractor/neteasemusic.py | 15 +- youtube_dl/extractor/netzkino.py | 7 +- youtube_dl/extractor/newstube.py | 5 +- youtube_dl/extractor/nextmedia.py | 2 +- youtube_dl/extractor/nfb.py | 2 +- youtube_dl/extractor/nfl.py | 10 +- youtube_dl/extractor/nhk.py | 2 +- youtube_dl/extractor/nhl.py | 12 +- youtube_dl/extractor/nick.py | 2 +- youtube_dl/extractor/niconico.py | 14 +- youtube_dl/extractor/ninecninemedia.py | 9 +- youtube_dl/extractor/ninegag.py | 2 +- youtube_dl/extractor/ninenow.py | 8 +- youtube_dl/extractor/nintendo.py | 2 +- youtube_dl/extractor/nobelprize.py | 8 +- youtube_dl/extractor/noco.py | 13 +- youtube_dl/extractor/normalboots.py | 5 +- youtube_dl/extractor/nosvideo.py | 2 +- youtube_dl/extractor/nova.py | 5 +- youtube_dl/extractor/novamov.py | 4 +- youtube_dl/extractor/nowness.py | 12 +- youtube_dl/extractor/nowtv.py | 4 +- youtube_dl/extractor/noz.py | 12 +- youtube_dl/extractor/npo.py | 4 +- youtube_dl/extractor/npr.py | 7 +- youtube_dl/extractor/nrk.py | 2 +- youtube_dl/extractor/ntvde.py | 8 +- youtube_dl/extractor/ntvru.py | 6 +- youtube_dl/extractor/nuevo.py | 6 +- youtube_dl/extractor/nuvid.py | 4 +- youtube_dl/extractor/nytimes.py | 6 +- youtube_dl/extractor/nzz.py | 4 +- youtube_dl/extractor/odatv.py | 6 +- youtube_dl/extractor/odnoklassniki.py | 4 +- youtube_dl/extractor/ondemandkorea.py | 5 +- youtube_dl/extractor/onet.py | 4 +- youtube_dl/extractor/onionstudios.py | 7 +- youtube_dl/extractor/ooyala.py | 21 +- youtube_dl/extractor/openload.py | 7 +- youtube_dl/extractor/ora.py | 9 +- youtube_dl/extractor/orf.py | 12 +- youtube_dl/extractor/pandatv.py | 5 +- youtube_dl/extractor/pandoratv.py | 7 +- youtube_dl/extractor/patreon.py | 2 +- youtube_dl/extractor/pbs.py | 4 +- youtube_dl/extractor/periscope.py | 5 +- youtube_dl/extractor/philharmoniedeparis.py | 7 +- youtube_dl/extractor/photobucket.py | 2 +- youtube_dl/extractor/piksel.py | 4 +- youtube_dl/extractor/pinkbike.py | 2 +- youtube_dl/extractor/pladform.py | 7 +- youtube_dl/extractor/playfm.py | 8 +- youtube_dl/extractor/plays.py | 2 +- youtube_dl/extractor/playtvak.py | 12 +- youtube_dl/extractor/playvid.py | 7 +- youtube_dl/extractor/playwire.py | 5 +- youtube_dl/extractor/pluralsight.py | 9 +- youtube_dl/extractor/podomatic.py | 2 +- youtube_dl/extractor/pokemon.py | 5 +- youtube_dl/extractor/polskieradio.py | 8 +- youtube_dl/extractor/porn91.py | 11 +- youtube_dl/extractor/porncom.py | 9 +- youtube_dl/extractor/pornflip.py | 11 +- youtube_dl/extractor/pornhd.py | 6 +- youtube_dl/extractor/pornhub.py | 6 +- youtube_dl/extractor/pornotube.py | 2 +- youtube_dl/extractor/pornovoisines.py | 6 +- youtube_dl/extractor/pornoxo.py | 4 +- youtube_dl/extractor/presstv.py | 2 +- youtube_dl/extractor/primesharetv.py | 6 +- youtube_dl/extractor/promptfile.py | 6 +- youtube_dl/extractor/prosiebensat1.py | 4 +- youtube_dl/extractor/puls4.py | 6 +- youtube_dl/extractor/pyvideo.py | 2 +- youtube_dl/extractor/qqmusic.py | 8 +- youtube_dl/extractor/r7.py | 2 +- youtube_dl/extractor/radiobremen.py | 2 +- youtube_dl/extractor/radiocanada.py | 12 +- youtube_dl/extractor/radiojavan.py | 5 +- youtube_dl/extractor/rai.py | 4 +- youtube_dl/extractor/rbmaradio.py | 2 +- youtube_dl/extractor/rds.py | 8 +- youtube_dl/extractor/redtube.py | 7 +- youtube_dl/extractor/regiotv.py | 7 +- youtube_dl/extractor/rentv.py | 2 +- youtube_dl/extractor/reuters.py | 6 +- youtube_dl/extractor/reverbnation.py | 5 +- youtube_dl/extractor/revision3.py | 9 +- youtube_dl/extractor/rice.py | 8 +- youtube_dl/extractor/rmcdecouverte.py | 7 +- youtube_dl/extractor/ro220.py | 2 +- youtube_dl/extractor/rockstargames.py | 5 +- youtube_dl/extractor/roosterteeth.py | 2 +- youtube_dl/extractor/roxwel.py | 2 +- youtube_dl/extractor/rozhlas.py | 5 +- youtube_dl/extractor/rtbf.py | 5 +- youtube_dl/extractor/rte.py | 9 +- youtube_dl/extractor/rtl2.py | 2 +- youtube_dl/extractor/rtlnl.py | 5 +- youtube_dl/extractor/rts.py | 4 +- youtube_dl/extractor/rtve.py | 6 +- youtube_dl/extractor/rtvnh.py | 2 +- youtube_dl/extractor/rudo.py | 6 +- youtube_dl/extractor/rutube.py | 11 +- youtube_dl/extractor/rutv.py | 5 +- youtube_dl/extractor/ruutu.py | 4 +- youtube_dl/extractor/safari.py | 5 +- youtube_dl/extractor/sandia.py | 5 +- youtube_dl/extractor/sapo.py | 5 +- youtube_dl/extractor/sbs.py | 5 +- youtube_dl/extractor/scivee.py | 2 +- youtube_dl/extractor/screencast.py | 9 +- youtube_dl/extractor/screencastomatic.py | 2 +- youtube_dl/extractor/senateisvp.py | 11 +- youtube_dl/extractor/sendtonews.py | 10 +- youtube_dl/extractor/servingsys.py | 4 +- youtube_dl/extractor/shahid.py | 6 +- youtube_dl/extractor/shared.py | 6 +- youtube_dl/extractor/showroomlive.py | 8 +- youtube_dl/extractor/sina.py | 12 +- youtube_dl/extractor/sixplay.py | 7 +- youtube_dl/extractor/skynewsarabia.py | 7 +- youtube_dl/extractor/skysports.py | 2 +- youtube_dl/extractor/slideshare.py | 11 +- youtube_dl/extractor/smotri.py | 6 +- youtube_dl/extractor/snotr.py | 6 +- youtube_dl/extractor/sohu.py | 7 +- youtube_dl/extractor/soundcloud.py | 19 +- youtube_dl/extractor/spankwire.py | 13 +- youtube_dl/extractor/spiegel.py | 6 +- youtube_dl/extractor/spiegeltv.py | 7 +- youtube_dl/extractor/sport5.py | 2 +- youtube_dl/extractor/sportbox.py | 7 +- youtube_dl/extractor/sportdeutschland.py | 5 +- youtube_dl/extractor/sportschau.py | 2 +- youtube_dl/extractor/srgssr.py | 8 +- youtube_dl/extractor/srmediathek.py | 5 +- youtube_dl/extractor/stanfordoc.py | 6 +- youtube_dl/extractor/steam.py | 5 +- youtube_dl/extractor/stitcher.py | 7 +- youtube_dl/extractor/streamable.py | 6 +- youtube_dl/extractor/streamcloud.py | 5 +- youtube_dl/extractor/streamcz.py | 5 +- youtube_dl/extractor/streetvoice.py | 2 +- youtube_dl/extractor/sunporno.py | 7 +- youtube_dl/extractor/svt.py | 7 +- youtube_dl/extractor/swrmediathek.py | 6 +- youtube_dl/extractor/syfy.py | 5 +- youtube_dl/extractor/tagesschau.py | 7 +- youtube_dl/extractor/tass.py | 5 +- youtube_dl/extractor/tbs.py | 2 +- youtube_dl/extractor/teachertube.py | 5 +- youtube_dl/extractor/teamcoco.py | 10 +- youtube_dl/extractor/teamfourstar.py | 2 +- youtube_dl/extractor/techtalks.py | 5 +- youtube_dl/extractor/ted.py | 3 +- youtube_dl/extractor/tele13.py | 6 +- youtube_dl/extractor/telegraaf.py | 5 +- youtube_dl/extractor/telemb.py | 2 +- youtube_dl/extractor/telequebec.py | 2 +- youtube_dl/extractor/teletask.py | 2 +- youtube_dl/extractor/testurl.py | 2 +- youtube_dl/extractor/tfo.py | 6 +- youtube_dl/extractor/theintercept.py | 8 +- youtube_dl/extractor/theplatform.py | 23 +- youtube_dl/extractor/thescene.py | 3 +- youtube_dl/extractor/thesixtyone.py | 2 +- youtube_dl/extractor/theweatherchannel.py | 5 +- youtube_dl/extractor/thisav.py | 2 +- youtube_dl/extractor/threeqsdn.py | 6 +- youtube_dl/extractor/tinypic.py | 2 +- youtube_dl/extractor/tlc.py | 7 +- youtube_dl/extractor/tnaflix.py | 2 +- youtube_dl/extractor/toggle.py | 4 +- youtube_dl/extractor/tonline.py | 2 +- youtube_dl/extractor/toutv.py | 8 +- youtube_dl/extractor/toypics.py | 3 +- youtube_dl/extractor/trilulilu.py | 6 +- youtube_dl/extractor/tube8.py | 5 +- youtube_dl/extractor/tubitv.py | 2 +- youtube_dl/extractor/tudou.py | 4 +- youtube_dl/extractor/tumblr.py | 2 +- youtube_dl/extractor/tunein.py | 4 +- youtube_dl/extractor/turbo.py | 7 +- youtube_dl/extractor/turner.py | 14 +- youtube_dl/extractor/tutv.py | 2 +- youtube_dl/extractor/tv2.py | 4 +- youtube_dl/extractor/tv4.py | 9 +- youtube_dl/extractor/tva.py | 6 +- youtube_dl/extractor/tvanouvelles.py | 2 +- youtube_dl/extractor/tvc.py | 5 +- youtube_dl/extractor/tvigle.py | 7 +- youtube_dl/extractor/tvnoe.py | 6 +- youtube_dl/extractor/tvp.py | 8 +- youtube_dl/extractor/tvplay.py | 10 +- youtube_dl/extractor/tweakers.py | 6 +- youtube_dl/extractor/twentyfourvideo.py | 7 +- youtube_dl/extractor/twentymin.py | 5 +- youtube_dl/extractor/twentytwotracks.py | 3 +- youtube_dl/extractor/twitch.py | 6 +- youtube_dl/extractor/twitter.py | 9 +- youtube_dl/extractor/udemy.py | 4 +- youtube_dl/extractor/udn.py | 8 +- youtube_dl/extractor/unistra.py | 2 +- youtube_dl/extractor/uol.py | 4 +- youtube_dl/extractor/uplynk.py | 5 +- youtube_dl/extractor/urort.py | 8 +- youtube_dl/extractor/usanetwork.py | 6 +- youtube_dl/extractor/usatoday.py | 6 +- youtube_dl/extractor/ustream.py | 11 +- youtube_dl/extractor/ustudio.py | 6 +- youtube_dl/extractor/varzesh3.py | 10 +- youtube_dl/extractor/vbox7.py | 2 +- youtube_dl/extractor/veehd.py | 13 +- youtube_dl/extractor/veoh.py | 8 +- youtube_dl/extractor/vessel.py | 6 +- youtube_dl/extractor/vesti.py | 2 +- youtube_dl/extractor/vevo.py | 10 +- youtube_dl/extractor/vgtv.py | 6 +- youtube_dl/extractor/vh1.py | 4 +- youtube_dl/extractor/vice.py | 16 +- youtube_dl/extractor/vidbit.py | 9 +- youtube_dl/extractor/viddler.py | 11 +- youtube_dl/extractor/videa.py | 2 +- youtube_dl/extractor/videodetective.py | 2 +- youtube_dl/extractor/videofyme.py | 5 +- youtube_dl/extractor/videomega.py | 5 +- youtube_dl/extractor/videomore.py | 6 +- youtube_dl/extractor/videopremium.py | 2 +- youtube_dl/extractor/vidio.py | 2 +- youtube_dl/extractor/vidme.py | 9 +- youtube_dl/extractor/vidzi.py | 6 +- youtube_dl/extractor/vier.py | 2 +- youtube_dl/extractor/viewlift.py | 2 +- youtube_dl/extractor/viewster.py | 11 +- youtube_dl/extractor/viidea.py | 11 +- youtube_dl/extractor/viki.py | 2 +- youtube_dl/extractor/vimeo.py | 22 +- youtube_dl/extractor/vimple.py | 2 +- youtube_dl/extractor/vine.py | 7 +- youtube_dl/extractor/viu.py | 7 +- youtube_dl/extractor/vk.py | 9 +- youtube_dl/extractor/vlive.py | 11 +- youtube_dl/extractor/vodlocker.py | 4 +- youtube_dl/extractor/vodplatform.py | 2 +- youtube_dl/extractor/voicerepublic.py | 7 +- youtube_dl/extractor/voxmedia.py | 2 +- youtube_dl/extractor/vporn.py | 7 +- youtube_dl/extractor/vrt.py | 4 +- youtube_dl/extractor/vube.py | 9 +- youtube_dl/extractor/vuclip.py | 10 +- youtube_dl/extractor/vvvvid.py | 6 +- youtube_dl/extractor/vyborymos.py | 2 +- youtube_dl/extractor/vzaar.py | 5 +- youtube_dl/extractor/walla.py | 5 +- youtube_dl/extractor/washingtonpost.py | 5 +- youtube_dl/extractor/wat.py | 9 +- youtube_dl/extractor/watchindianporn.py | 6 +- youtube_dl/extractor/wdr.py | 4 +- youtube_dl/extractor/webcaster.py | 5 +- youtube_dl/extractor/webofstories.py | 2 +- youtube_dl/extractor/wimp.py | 2 +- youtube_dl/extractor/wistia.py | 6 +- youtube_dl/extractor/wrzuta.py | 7 +- youtube_dl/extractor/wsj.py | 6 +- youtube_dl/extractor/xbef.py | 2 +- youtube_dl/extractor/xboxclips.py | 6 +- youtube_dl/extractor/xfileshare.py | 8 +- youtube_dl/extractor/xhamster.py | 7 +- youtube_dl/extractor/xiami.py | 2 +- youtube_dl/extractor/xminus.py | 9 +- youtube_dl/extractor/xnxx.py | 2 +- youtube_dl/extractor/xstream.py | 6 +- youtube_dl/extractor/xtube.py | 2 +- youtube_dl/extractor/xuite.py | 8 +- youtube_dl/extractor/xvideos.py | 8 +- youtube_dl/extractor/xxxymovies.py | 5 +- youtube_dl/extractor/yahoo.py | 19 +- youtube_dl/extractor/yam.py | 6 +- youtube_dl/extractor/yandexmusic.py | 10 +- youtube_dl/extractor/yesjapan.py | 6 +- youtube_dl/extractor/yinyuetai.py | 2 +- youtube_dl/extractor/ynet.py | 4 +- youtube_dl/extractor/youku.py | 10 +- youtube_dl/extractor/youporn.py | 4 +- youtube_dl/extractor/yourupload.py | 2 +- youtube_dl/extractor/youtube.py | 13 +- youtube_dl/extractor/zapiks.py | 6 +- youtube_dl/extractor/zdf.py | 4 +- youtube_dl/extractor/zingmp3.py | 6 +- 589 files changed, 1320 insertions(+), 3079 deletions(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index 0247cabf9..22e6b8360 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, js_to_json, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - ExtractorError, - js_to_json, - int_or_none, - parse_iso8601, -) class ABCIE(InfoExtractor): diff --git a/youtube_dl/extractor/abcnews.py b/youtube_dl/extractor/abcnews.py index 4f56c4c11..75da7d816 100644 --- a/youtube_dl/extractor/abcnews.py +++ b/youtube_dl/extractor/abcnews.py @@ -5,9 +5,9 @@ import calendar import re import time +from ..compat import compat_urlparse from .amp import AMPIE from .common import InfoExtractor -from ..compat import compat_urlparse class AbcNewsVideoIE(AMPIE): diff --git a/youtube_dl/extractor/abcotvs.py b/youtube_dl/extractor/abcotvs.py index 76e98132b..8ba74c92b 100644 --- a/youtube_dl/extractor/abcotvs.py +++ b/youtube_dl/extractor/abcotvs.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class ABCOTVSIE(InfoExtractor): diff --git a/youtube_dl/extractor/acast.py b/youtube_dl/extractor/acast.py index 6dace3051..df3d83e29 100644 --- a/youtube_dl/extractor/acast.py +++ b/youtube_dl/extractor/acast.py @@ -1,16 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re import functools +import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_iso8601, - OnDemandPagedList, -) +from ..utils import OnDemandPagedList, int_or_none, parse_iso8601 +from .common import InfoExtractor class ACastIE(InfoExtractor): diff --git a/youtube_dl/extractor/addanime.py b/youtube_dl/extractor/addanime.py index 55a9322a7..c74b83e39 100644 --- a/youtube_dl/extractor/addanime.py +++ b/youtube_dl/extractor/addanime.py @@ -2,17 +2,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import ( compat_HTTPError, compat_str, compat_urllib_parse_urlencode, compat_urllib_parse_urlparse, ) -from ..utils import ( - ExtractorError, - qualities, -) +from ..utils import ExtractorError, qualities +from .common import InfoExtractor class AddAnimeIE(InfoExtractor): diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 12eeab271..cd8e83a03 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -5,15 +5,14 @@ import re import time import xml.etree.ElementTree as etree -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - unescapeHTML, - urlencode_postdata, - unified_timestamp, ExtractorError, + unescapeHTML, + unified_timestamp, + urlencode_postdata, ) - +from .common import InfoExtractor MSO_INFO = { 'DTV': { diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dl/extractor/adobetv.py index 008c98e51..3729aeddc 100644 --- a/youtube_dl/extractor/adobetv.py +++ b/youtube_dl/extractor/adobetv.py @@ -2,17 +2,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - parse_duration, - unified_strdate, - str_to_int, - int_or_none, - float_or_none, ISO639Utils, determine_ext, + float_or_none, + int_or_none, + parse_duration, + str_to_int, + unified_strdate, ) +from .common import InfoExtractor class AdobeTVBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py index 989505c82..e7a9b5a63 100644 --- a/youtube_dl/extractor/adultswim.py +++ b/youtube_dl/extractor/adultswim.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none from .turner import TurnerBaseIE -from ..utils import ( - ExtractorError, - int_or_none, -) class AdultSwimIE(TurnerBaseIE): diff --git a/youtube_dl/extractor/aenetworks.py b/youtube_dl/extractor/aenetworks.py index c97317400..6e3af5294 100644 --- a/youtube_dl/extractor/aenetworks.py +++ b/youtube_dl/extractor/aenetworks.py @@ -2,17 +2,15 @@ from __future__ import unicode_literals import re -from .theplatform import ThePlatformIE +from ..compat import compat_urlparse from ..utils import ( - smuggle_url, - update_url_query, - unescapeHTML, extract_attributes, get_element_by_attribute, + smuggle_url, + unescapeHTML, + update_url_query, ) -from ..compat import ( - compat_urlparse, -) +from .theplatform import ThePlatformIE class AENetworksBaseIE(ThePlatformIE): diff --git a/youtube_dl/extractor/afreecatv.py b/youtube_dl/extractor/afreecatv.py index 4f6cdb8a2..e49436044 100644 --- a/youtube_dl/extractor/afreecatv.py +++ b/youtube_dl/extractor/afreecatv.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, - compat_urlparse, -) +from ..compat import compat_urllib_parse_urlparse, compat_urlparse from ..utils import ( ExtractorError, int_or_none, @@ -15,6 +11,7 @@ from ..utils import ( xpath_element, xpath_text, ) +from .common import InfoExtractor class AfreecaTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/airmozilla.py b/youtube_dl/extractor/airmozilla.py index 0e0691879..d47f716ed 100644 --- a/youtube_dl/extractor/airmozilla.py +++ b/youtube_dl/extractor/airmozilla.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, -) class AirMozillaIE(InfoExtractor): diff --git a/youtube_dl/extractor/allocine.py b/youtube_dl/extractor/allocine.py index 90f11d39f..409de4fc3 100644 --- a/youtube_dl/extractor/allocine.py +++ b/youtube_dl/extractor/allocine.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import qualities, remove_end, url_basename from .common import InfoExtractor -from ..utils import ( - remove_end, - qualities, - url_basename, -) class AllocineIE(InfoExtractor): diff --git a/youtube_dl/extractor/alphaporno.py b/youtube_dl/extractor/alphaporno.py index 3a6d99f6b..ba8fbeaac 100644 --- a/youtube_dl/extractor/alphaporno.py +++ b/youtube_dl/extractor/alphaporno.py @@ -1,12 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none, parse_duration, parse_filesize, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - parse_duration, - parse_filesize, - int_or_none, -) class AlphaPornoIE(InfoExtractor): diff --git a/youtube_dl/extractor/amcnetworks.py b/youtube_dl/extractor/amcnetworks.py index 87c803e94..3351ddd66 100644 --- a/youtube_dl/extractor/amcnetworks.py +++ b/youtube_dl/extractor/amcnetworks.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_age_limit, update_url_query from .theplatform import ThePlatformIE -from ..utils import ( - update_url_query, - parse_age_limit, - int_or_none, -) class AMCNetworksIE(ThePlatformIE): diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py index e8e40126b..c5c718bab 100644 --- a/youtube_dl/extractor/amp.py +++ b/youtube_dl/extractor/amp.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, int_or_none, mimetype2ext, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - mimetype2ext, - determine_ext, -) class AMPIE(InfoExtractor): diff --git a/youtube_dl/extractor/animeondemand.py b/youtube_dl/extractor/animeondemand.py index 9e28f2579..3efba140c 100644 --- a/youtube_dl/extractor/animeondemand.py +++ b/youtube_dl/extractor/animeondemand.py @@ -2,18 +2,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_str, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( + ExtractorError, determine_ext, extract_attributes, - ExtractorError, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class AnimeOnDemandIE(InfoExtractor): diff --git a/youtube_dl/extractor/anvato.py b/youtube_dl/extractor/anvato.py index 623f44dce..99bb09146 100644 --- a/youtube_dl/extractor/anvato.py +++ b/youtube_dl/extractor/anvato.py @@ -7,16 +7,16 @@ import json import random import time -from .common import InfoExtractor from ..aes import aes_encrypt from ..compat import compat_str from ..utils import ( bytes_to_intlist, determine_ext, - intlist_to_bytes, int_or_none, + intlist_to_bytes, strip_jsonp, ) +from .common import InfoExtractor def md5_text(s): diff --git a/youtube_dl/extractor/anysex.py b/youtube_dl/extractor/anysex.py index ad86d6e58..b72c777bc 100644 --- a/youtube_dl/extractor/anysex.py +++ b/youtube_dl/extractor/anysex.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, -) class AnySexIE(InfoExtractor): diff --git a/youtube_dl/extractor/aol.py b/youtube_dl/extractor/aol.py index b50f454ee..0277ac62a 100644 --- a/youtube_dl/extractor/aol.py +++ b/youtube_dl/extractor/aol.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, -) class AolIE(InfoExtractor): diff --git a/youtube_dl/extractor/aparat.py b/youtube_dl/extractor/aparat.py index 025e29aa4..7f0d8c564 100644 --- a/youtube_dl/extractor/aparat.py +++ b/youtube_dl/extractor/aparat.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, HEADRequest from .common import InfoExtractor -from ..utils import ( - ExtractorError, - HEADRequest, -) class AparatIE(InfoExtractor): diff --git a/youtube_dl/extractor/appleconnect.py b/youtube_dl/extractor/appleconnect.py index ea7a70393..c5a6c21e3 100644 --- a/youtube_dl/extractor/appleconnect.py +++ b/youtube_dl/extractor/appleconnect.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, str_to_int from .common import InfoExtractor -from ..utils import ( - str_to_int, - ExtractorError -) class AppleConnectIE(InfoExtractor): diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py index a6801f3d4..27882a0d9 100644 --- a/youtube_dl/extractor/appletrailers.py +++ b/youtube_dl/extractor/appletrailers.py @@ -1,15 +1,11 @@ from __future__ import unicode_literals -import re import json +import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - parse_duration, - unified_strdate, -) +from ..utils import int_or_none, parse_duration, unified_strdate +from .common import InfoExtractor class AppleTrailersIE(InfoExtractor): diff --git a/youtube_dl/extractor/archiveorg.py b/youtube_dl/extractor/archiveorg.py index 486dff82d..0609c7110 100644 --- a/youtube_dl/extractor/archiveorg.py +++ b/youtube_dl/extractor/archiveorg.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import clean_html, unified_strdate from .jwplatform import JWPlatformBaseIE -from ..utils import ( - unified_strdate, - clean_html, -) class ArchiveOrgIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index 2d5599456..465cb707d 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -3,19 +3,19 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from .generic import GenericIE +from ..compat import compat_etree_fromstring from ..utils import ( - determine_ext, ExtractorError, - qualities, + determine_ext, int_or_none, parse_duration, + qualities, unified_strdate, - xpath_text, update_url_query, + xpath_text, ) -from ..compat import compat_etree_fromstring +from .common import InfoExtractor +from .generic import GenericIE class ARDMediathekIE(InfoExtractor): diff --git a/youtube_dl/extractor/arkena.py b/youtube_dl/extractor/arkena.py index 50ffb442d..c789f02cb 100644 --- a/youtube_dl/extractor/arkena.py +++ b/youtube_dl/extractor/arkena.py @@ -3,17 +3,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, int_or_none, mimetype2ext, parse_iso8601, strip_jsonp, ) +from .common import InfoExtractor class ArkenaIE(InfoExtractor): diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py index 69a23e88c..aaf3f07a0 100644 --- a/youtube_dl/extractor/arte.py +++ b/youtube_dl/extractor/arte.py @@ -3,19 +3,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse from ..utils import ( + NO_DEFAULT, find_xpath_attr, - unified_strdate, get_element_by_attribute, int_or_none, - NO_DEFAULT, qualities, + unified_strdate, ) +from .common import InfoExtractor + # There are different sources of video in arte.tv, the extraction process # is different for each one. The videos usually expire in 7 days, so we can't diff --git a/youtube_dl/extractor/atresplayer.py b/youtube_dl/extractor/atresplayer.py index e3c669830..ef45ef3ad 100644 --- a/youtube_dl/extractor/atresplayer.py +++ b/youtube_dl/extractor/atresplayer.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals -import time -import hmac import hashlib +import hmac import re +import time -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( ExtractorError, @@ -15,6 +14,7 @@ from ..utils import ( urlencode_postdata, xpath_text, ) +from .common import InfoExtractor class AtresPlayerIE(InfoExtractor): diff --git a/youtube_dl/extractor/atttechchannel.py b/youtube_dl/extractor/atttechchannel.py index 8f93fb353..dde66342a 100644 --- a/youtube_dl/extractor/atttechchannel.py +++ b/youtube_dl/extractor/atttechchannel.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class ATTTechChannelIE(InfoExtractor): diff --git a/youtube_dl/extractor/audimedia.py b/youtube_dl/extractor/audimedia.py index aa6925623..578bed8fc 100644 --- a/youtube_dl/extractor/audimedia.py +++ b/youtube_dl/extractor/audimedia.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601, sanitized_Request from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - sanitized_Request, -) class AudiMediaIE(InfoExtractor): diff --git a/youtube_dl/extractor/audioboom.py b/youtube_dl/extractor/audioboom.py index 8fc5f65c6..bdef21b47 100644 --- a/youtube_dl/extractor/audioboom.py +++ b/youtube_dl/extractor/audioboom.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import float_or_none +from .common import InfoExtractor class AudioBoomIE(InfoExtractor): diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py index f3bd4d444..d272ebdc5 100644 --- a/youtube_dl/extractor/audiomack.py +++ b/youtube_dl/extractor/audiomack.py @@ -4,13 +4,10 @@ from __future__ import unicode_literals import itertools import time +from ..compat import compat_str +from ..utils import ExtractorError, url_basename from .common import InfoExtractor from .soundcloud import SoundcloudIE -from ..compat import compat_str -from ..utils import ( - ExtractorError, - url_basename, -) class AudiomackIE(InfoExtractor): diff --git a/youtube_dl/extractor/awaan.py b/youtube_dl/extractor/awaan.py index a2603bbff..c0267e46f 100644 --- a/youtube_dl/extractor/awaan.py +++ b/youtube_dl/extractor/awaan.py @@ -1,14 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -import re import base64 +import re -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_str, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ( int_or_none, parse_iso8601, @@ -16,6 +12,7 @@ from ..utils import ( unsmuggle_url, urlencode_postdata, ) +from .common import InfoExtractor class AWAANIE(InfoExtractor): diff --git a/youtube_dl/extractor/azmedien.py b/youtube_dl/extractor/azmedien.py index a89f71c20..b27c3a000 100644 --- a/youtube_dl/extractor/azmedien.py +++ b/youtube_dl/extractor/azmedien.py @@ -2,12 +2,9 @@ from __future__ import unicode_literals import re +from ..utils import get_element_by_class, strip_or_none from .common import InfoExtractor from .kaltura import KalturaIE -from ..utils import ( - get_element_by_class, - strip_or_none, -) class AZMedienBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/azubu.py b/youtube_dl/extractor/azubu.py index 3ba2f00d3..407417bf4 100644 --- a/youtube_dl/extractor/azubu.py +++ b/youtube_dl/extractor/azubu.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import json +from ..utils import ExtractorError, float_or_none, sanitized_Request from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - sanitized_Request, -) class AzubuIE(InfoExtractor): diff --git a/youtube_dl/extractor/baidu.py b/youtube_dl/extractor/baidu.py index 234a661d3..09338fcab 100644 --- a/youtube_dl/extractor/baidu.py +++ b/youtube_dl/extractor/baidu.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import unescapeHTML +from .common import InfoExtractor class BaiduVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/bambuser.py b/youtube_dl/extractor/bambuser.py index 0eb1930c2..350bafd08 100644 --- a/youtube_dl/extractor/bambuser.py +++ b/youtube_dl/extractor/bambuser.py @@ -1,9 +1,8 @@ from __future__ import unicode_literals -import re import itertools +import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( ExtractorError, @@ -12,6 +11,7 @@ from ..utils import ( sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class BambuserIE(InfoExtractor): diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index 88c590e98..fd810a6b1 100644 --- a/youtube_dl/extractor/bandcamp.py +++ b/youtube_dl/extractor/bandcamp.py @@ -5,11 +5,7 @@ import random import re import time -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, float_or_none, @@ -18,6 +14,7 @@ from ..utils import ( unescapeHTML, update_url_query, ) +from .common import InfoExtractor class BandcampIE(InfoExtractor): diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py index b17916137..bb09a9fd9 100644 --- a/youtube_dl/extractor/bbc.py +++ b/youtube_dl/extractor/bbc.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re -from .common import InfoExtractor +from ..compat import compat_etree_fromstring, compat_HTTPError, compat_urlparse from ..utils import ( - dict_get, ExtractorError, + dict_get, float_or_none, int_or_none, parse_duration, @@ -15,11 +15,7 @@ from ..utils import ( try_get, unescapeHTML, ) -from ..compat import ( - compat_etree_fromstring, - compat_HTTPError, - compat_urlparse, -) +from .common import InfoExtractor class BBCCoUkIE(InfoExtractor): diff --git a/youtube_dl/extractor/beampro.py b/youtube_dl/extractor/beampro.py index f3a9e3278..02189768e 100644 --- a/youtube_dl/extractor/beampro.py +++ b/youtube_dl/extractor/beampro.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( ExtractorError, clean_html, @@ -10,6 +9,7 @@ from ..utils import ( parse_iso8601, try_get, ) +from .common import InfoExtractor class BeamProLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/beatport.py b/youtube_dl/extractor/beatport.py index e60709417..5600776bd 100644 --- a/youtube_dl/extractor/beatport.py +++ b/youtube_dl/extractor/beatport.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import int_or_none +from .common import InfoExtractor class BeatportIE(InfoExtractor): diff --git a/youtube_dl/extractor/beeg.py b/youtube_dl/extractor/beeg.py index b0b7914d8..6b43e72bc 100644 --- a/youtube_dl/extractor/beeg.py +++ b/youtube_dl/extractor/beeg.py @@ -1,15 +1,8 @@ from __future__ import unicode_literals +from ..compat import compat_chr, compat_ord, compat_urllib_parse_unquote +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..compat import ( - compat_chr, - compat_ord, - compat_urllib_parse_unquote, -) -from ..utils import ( - int_or_none, - parse_iso8601, -) class BeegIE(InfoExtractor): diff --git a/youtube_dl/extractor/behindkink.py b/youtube_dl/extractor/behindkink.py index 9bca853b3..f75abe472 100644 --- a/youtube_dl/extractor/behindkink.py +++ b/youtube_dl/extractor/behindkink.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import url_basename +from .common import InfoExtractor class BehindKinkIE(InfoExtractor): diff --git a/youtube_dl/extractor/bet.py b/youtube_dl/extractor/bet.py index d7ceaa85e..f6e1fe101 100644 --- a/youtube_dl/extractor/bet.py +++ b/youtube_dl/extractor/bet.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .mtv import MTVServicesInfoExtractor from ..utils import unified_strdate +from .mtv import MTVServicesInfoExtractor class BetIE(MTVServicesInfoExtractor): diff --git a/youtube_dl/extractor/bigflix.py b/youtube_dl/extractor/bigflix.py index b4ce767af..ab3bcf1fe 100644 --- a/youtube_dl/extractor/bigflix.py +++ b/youtube_dl/extractor/bigflix.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import base64 import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class BigflixIE(InfoExtractor): diff --git a/youtube_dl/extractor/bild.py b/youtube_dl/extractor/bild.py index b8dfbd42b..36ee2ec46 100644 --- a/youtube_dl/extractor/bild.py +++ b/youtube_dl/extractor/bild.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, unescapeHTML from .common import InfoExtractor -from ..utils import ( - int_or_none, - unescapeHTML, -) class BildIE(InfoExtractor): diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 85ea5e6ee..cddacbfc1 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -4,14 +4,14 @@ from __future__ import unicode_literals import hashlib import re -from .common import InfoExtractor from ..compat import compat_parse_qs from ..utils import ( - int_or_none, float_or_none, + int_or_none, unified_timestamp, urlencode_postdata, ) +from .common import InfoExtractor class BiliBiliIE(InfoExtractor): diff --git a/youtube_dl/extractor/biobiochiletv.py b/youtube_dl/extractor/biobiochiletv.py index b92031c8a..809a549ce 100644 --- a/youtube_dl/extractor/biobiochiletv.py +++ b/youtube_dl/extractor/biobiochiletv.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, remove_end from .common import InfoExtractor -from ..utils import ( - ExtractorError, - remove_end, -) from .rudo import RudoIE diff --git a/youtube_dl/extractor/bleacherreport.py b/youtube_dl/extractor/bleacherreport.py index 7a8e1f60b..e2038ec47 100644 --- a/youtube_dl/extractor/bleacherreport.py +++ b/youtube_dl/extractor/bleacherreport.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor +from ..utils import ExtractorError, int_or_none, parse_iso8601 from .amp import AMPIE -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from .common import InfoExtractor class BleacherReportIE(InfoExtractor): diff --git a/youtube_dl/extractor/blinkx.py b/youtube_dl/extractor/blinkx.py index 3b8eabe8f..2f5983e1f 100644 --- a/youtube_dl/extractor/blinkx.py +++ b/youtube_dl/extractor/blinkx.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import json +from ..utils import int_or_none, remove_start from .common import InfoExtractor -from ..utils import ( - remove_start, - int_or_none, -) class BlinkxIE(InfoExtractor): diff --git a/youtube_dl/extractor/bokecc.py b/youtube_dl/extractor/bokecc.py index 86a7f4d7d..f8fb0555a 100644 --- a/youtube_dl/extractor/bokecc.py +++ b/youtube_dl/extractor/bokecc.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_parse_qs from ..utils import ExtractorError +from .common import InfoExtractor class BokeCCBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/bpb.py b/youtube_dl/extractor/bpb.py index 9661ade4f..6ac906ccd 100644 --- a/youtube_dl/extractor/bpb.py +++ b/youtube_dl/extractor/bpb.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, js_to_json from .common import InfoExtractor -from ..utils import ( - js_to_json, - determine_ext, -) class BpbIE(InfoExtractor): diff --git a/youtube_dl/extractor/br.py b/youtube_dl/extractor/br.py index ff0aa11b1..42237ef73 100644 --- a/youtube_dl/extractor/br.py +++ b/youtube_dl/extractor/br.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, @@ -11,6 +10,7 @@ from ..utils import ( xpath_element, xpath_text, ) +from .common import InfoExtractor class BRIE(InfoExtractor): diff --git a/youtube_dl/extractor/bravotv.py b/youtube_dl/extractor/bravotv.py index a25d500e4..d8eb07e4b 100644 --- a/youtube_dl/extractor/bravotv.py +++ b/youtube_dl/extractor/bravotv.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, smuggle_url, update_url_query from .adobepass import AdobePassIE -from ..utils import ( - smuggle_url, - update_url_query, - int_or_none, -) class BravoTVIE(AdobePassIE): diff --git a/youtube_dl/extractor/breakcom.py b/youtube_dl/extractor/breakcom.py index 5a87c2661..e51c64dec 100644 --- a/youtube_dl/extractor/breakcom.py +++ b/youtube_dl/extractor/breakcom.py @@ -2,12 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_age_limit, -) +from ..utils import int_or_none, parse_age_limit +from .common import InfoExtractor class BreakIE(InfoExtractor): diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index 5c6e99da1..01a6b9868 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -1,34 +1,34 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re -from .common import InfoExtractor from ..compat import ( compat_etree_fromstring, + compat_HTTPError, compat_parse_qs, compat_str, compat_urllib_parse_urlparse, compat_urlparse, compat_xml_parse_error, - compat_HTTPError, ) from ..utils import ( - determine_ext, ExtractorError, + clean_html, + determine_ext, find_xpath_attr, fix_xml_ampersands, float_or_none, - js_to_json, int_or_none, + js_to_json, + mimetype2ext, parse_iso8601, unescapeHTML, unsmuggle_url, update_url_query, - clean_html, - mimetype2ext, ) +from .common import InfoExtractor class BrightcoveLegacyIE(InfoExtractor): diff --git a/youtube_dl/extractor/byutv.py b/youtube_dl/extractor/byutv.py index 8ef089653..3a577e7f8 100644 --- a/youtube_dl/extractor/byutv.py +++ b/youtube_dl/extractor/byutv.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class BYUtvIE(InfoExtractor): diff --git a/youtube_dl/extractor/c56.py b/youtube_dl/extractor/c56.py index cac8fdcba..edf6458dd 100644 --- a/youtube_dl/extractor/c56.py +++ b/youtube_dl/extractor/c56.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import js_to_json +from .common import InfoExtractor class C56IE(InfoExtractor): diff --git a/youtube_dl/extractor/camdemy.py b/youtube_dl/extractor/camdemy.py index 8f0c6c545..07cac51fc 100644 --- a/youtube_dl/extractor/camdemy.py +++ b/youtube_dl/extractor/camdemy.py @@ -3,17 +3,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_urllib_parse_urlencode, compat_urlparse +from ..utils import clean_html, parse_duration, str_to_int, unified_strdate from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_urlparse, -) -from ..utils import ( - clean_html, - parse_duration, - str_to_int, - unified_strdate, -) class CamdemyIE(InfoExtractor): diff --git a/youtube_dl/extractor/camwithher.py b/youtube_dl/extractor/camwithher.py index afbc5ea26..3d73aaa28 100644 --- a/youtube_dl/extractor/camwithher.py +++ b/youtube_dl/extractor/camwithher.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - unified_strdate, -) class CamWithHerIE(InfoExtractor): diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dl/extractor/canalc2.py index f1f128c45..acdae016e 100644 --- a/youtube_dl/extractor/canalc2.py +++ b/youtube_dl/extractor/canalc2.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import parse_duration +from .common import InfoExtractor class Canalc2IE(InfoExtractor): diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dl/extractor/canalplus.py index b3f76a7b1..6ff524a73 100644 --- a/youtube_dl/extractor/canalplus.py +++ b/youtube_dl/extractor/canalplus.py @@ -3,17 +3,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse from ..utils import ( - dict_get, ExtractorError, HEADRequest, + dict_get, int_or_none, qualities, remove_end, unified_strdate, ) +from .common import InfoExtractor class CanalplusIE(InfoExtractor): diff --git a/youtube_dl/extractor/canvas.py b/youtube_dl/extractor/canvas.py index 544c6657c..89643549a 100644 --- a/youtube_dl/extractor/canvas.py +++ b/youtube_dl/extractor/canvas.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import float_or_none +from .common import InfoExtractor class CanvasIE(InfoExtractor): diff --git a/youtube_dl/extractor/carambatv.py b/youtube_dl/extractor/carambatv.py index 9ba909a91..176edcd41 100644 --- a/youtube_dl/extractor/carambatv.py +++ b/youtube_dl/extractor/carambatv.py @@ -1,14 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - float_or_none, - int_or_none, - try_get, -) - +from ..utils import float_or_none, int_or_none, try_get +from .common import InfoExtractor from .videomore import VideomoreIE diff --git a/youtube_dl/extractor/cbc.py b/youtube_dl/extractor/cbc.py index a291685bf..a70b55fdf 100644 --- a/youtube_dl/extractor/cbc.py +++ b/youtube_dl/extractor/cbc.py @@ -3,21 +3,21 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + ExtractorError, + find_xpath_attr, + int_or_none, js_to_json, + parse_age_limit, + parse_iso8601, smuggle_url, try_get, - xpath_text, xpath_element, + xpath_text, xpath_with_ns, - find_xpath_attr, - parse_iso8601, - parse_age_limit, - int_or_none, - ExtractorError, ) +from .common import InfoExtractor class CBCIE(InfoExtractor): diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index 58f258c54..5abdbc6cc 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -1,13 +1,13 @@ from __future__ import unicode_literals -from .theplatform import ThePlatformFeedIE from ..utils import ( - int_or_none, find_xpath_attr, + int_or_none, + update_url_query, xpath_element, xpath_text, - update_url_query, ) +from .theplatform import ThePlatformFeedIE class CBSBaseIE(ThePlatformFeedIE): diff --git a/youtube_dl/extractor/cbsinteractive.py b/youtube_dl/extractor/cbsinteractive.py index 57b18e81d..e1c631ccd 100644 --- a/youtube_dl/extractor/cbsinteractive.py +++ b/youtube_dl/extractor/cbsinteractive.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .theplatform import ThePlatformIE from ..utils import int_or_none +from .theplatform import ThePlatformIE class CBSInteractiveIE(ThePlatformIE): diff --git a/youtube_dl/extractor/cbslocal.py b/youtube_dl/extractor/cbslocal.py index 8d5f11dd1..a26d0276c 100644 --- a/youtube_dl/extractor/cbslocal.py +++ b/youtube_dl/extractor/cbslocal.py @@ -1,13 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_urlparse +from ..utils import parse_iso8601, unified_timestamp from .anvato import AnvatoIE from .sendtonews import SendtoNewsIE -from ..compat import compat_urlparse -from ..utils import ( - parse_iso8601, - unified_timestamp, -) class CBSLocalIE(AnvatoIE): diff --git a/youtube_dl/extractor/cbsnews.py b/youtube_dl/extractor/cbsnews.py index 17bb9af4f..5b54ec212 100644 --- a/youtube_dl/extractor/cbsnews.py +++ b/youtube_dl/extractor/cbsnews.py @@ -1,11 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor +from ..utils import parse_duration from .cbs import CBSIE -from ..utils import ( - parse_duration, -) +from .common import InfoExtractor class CBSNewsIE(CBSIE): diff --git a/youtube_dl/extractor/ccc.py b/youtube_dl/extractor/ccc.py index 734702144..7c227c74c 100644 --- a/youtube_dl/extractor/ccc.py +++ b/youtube_dl/extractor/ccc.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class CCCIE(InfoExtractor): diff --git a/youtube_dl/extractor/ccma.py b/youtube_dl/extractor/ccma.py index 39938c9ac..39eae37cf 100644 --- a/youtube_dl/extractor/ccma.py +++ b/youtube_dl/extractor/ccma.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import clean_html, int_or_none, parse_duration, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, - clean_html, -) class CCMAIE(InfoExtractor): diff --git a/youtube_dl/extractor/cctv.py b/youtube_dl/extractor/cctv.py index c76f361c6..45ddb6df5 100644 --- a/youtube_dl/extractor/cctv.py +++ b/youtube_dl/extractor/cctv.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - float_or_none, - try_get, - unified_timestamp, -) +from ..utils import float_or_none, try_get, unified_timestamp +from .common import InfoExtractor class CCTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/cda.py b/youtube_dl/extractor/cda.py index ae7af2f0e..3949e11ee 100755 --- a/youtube_dl/extractor/cda.py +++ b/youtube_dl/extractor/cda.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, float_or_none, int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, - parse_duration, -) class CDAIE(InfoExtractor): diff --git a/youtube_dl/extractor/ceskatelevize.py b/youtube_dl/extractor/ceskatelevize.py index 4f88c31ad..375b442b7 100644 --- a/youtube_dl/extractor/ceskatelevize.py +++ b/youtube_dl/extractor/ceskatelevize.py @@ -3,17 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_urllib_parse_urlparse, -) +from ..compat import compat_urllib_parse_unquote, compat_urllib_parse_urlparse from ..utils import ( ExtractorError, float_or_none, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class CeskaTelevizeIE(InfoExtractor): diff --git a/youtube_dl/extractor/channel9.py b/youtube_dl/extractor/channel9.py index 865dbcaba..abb49ce8a 100644 --- a/youtube_dl/extractor/channel9.py +++ b/youtube_dl/extractor/channel9.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, parse_filesize, qualities from .common import InfoExtractor -from ..utils import ( - ExtractorError, - parse_filesize, - qualities, -) class Channel9IE(InfoExtractor): diff --git a/youtube_dl/extractor/charlierose.py b/youtube_dl/extractor/charlierose.py index 2d517f231..649e19938 100644 --- a/youtube_dl/extractor/charlierose.py +++ b/youtube_dl/extractor/charlierose.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import remove_end +from .common import InfoExtractor class CharlieRoseIE(InfoExtractor): diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dl/extractor/chaturbate.py index 8fbc91c1f..7db34be8a 100644 --- a/youtube_dl/extractor/chaturbate.py +++ b/youtube_dl/extractor/chaturbate.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class ChaturbateIE(InfoExtractor): diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dl/extractor/chilloutzone.py index 0206d96db..55689ec02 100644 --- a/youtube_dl/extractor/chilloutzone.py +++ b/youtube_dl/extractor/chilloutzone.py @@ -1,14 +1,11 @@ from __future__ import unicode_literals -import re import base64 import json +import re +from ..utils import ExtractorError, clean_html from .common import InfoExtractor -from ..utils import ( - clean_html, - ExtractorError -) class ChilloutzoneIE(InfoExtractor): diff --git a/youtube_dl/extractor/chirbit.py b/youtube_dl/extractor/chirbit.py index 4815b34be..36fcc7ead 100644 --- a/youtube_dl/extractor/chirbit.py +++ b/youtube_dl/extractor/chirbit.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import base64 import re -from .common import InfoExtractor from ..utils import parse_duration +from .common import InfoExtractor class ChirbitIE(InfoExtractor): diff --git a/youtube_dl/extractor/cinchcast.py b/youtube_dl/extractor/cinchcast.py index 562c9bbbb..e0a968b8a 100644 --- a/youtube_dl/extractor/cinchcast.py +++ b/youtube_dl/extractor/cinchcast.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import unified_strdate, xpath_text from .common import InfoExtractor -from ..utils import ( - unified_strdate, - xpath_text, -) class CinchcastIE(InfoExtractor): diff --git a/youtube_dl/extractor/clipfish.py b/youtube_dl/extractor/clipfish.py index bb52e0c6f..fb0019ebf 100644 --- a/youtube_dl/extractor/clipfish.py +++ b/youtube_dl/extractor/clipfish.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) class ClipfishIE(InfoExtractor): diff --git a/youtube_dl/extractor/cliphunter.py b/youtube_dl/extractor/cliphunter.py index ab651d1c8..00b1d6eff 100644 --- a/youtube_dl/extractor/cliphunter.py +++ b/youtube_dl/extractor/cliphunter.py @@ -1,8 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none - +from .common import InfoExtractor _translation_table = { 'a': 'h', 'd': 'e', 'e': 'v', 'f': 'o', 'g': 'f', 'i': 'd', 'l': 'n', diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dl/extractor/clipsyndicate.py index 6cdb42f5a..f0a3216d1 100644 --- a/youtube_dl/extractor/clipsyndicate.py +++ b/youtube_dl/extractor/clipsyndicate.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import find_xpath_attr, fix_xml_ampersands from .common import InfoExtractor -from ..utils import ( - find_xpath_attr, - fix_xml_ampersands -) class ClipsyndicateIE(InfoExtractor): diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dl/extractor/cloudy.py index ae5ba0015..e1748fabb 100644 --- a/youtube_dl/extractor/cloudy.py +++ b/youtube_dl/extractor/cloudy.py @@ -3,16 +3,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_HTTPError, compat_parse_qs +from ..utils import ExtractorError, HEADRequest, remove_end from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_HTTPError, -) -from ..utils import ( - ExtractorError, - HEADRequest, - remove_end, -) class CloudyIE(InfoExtractor): diff --git a/youtube_dl/extractor/clubic.py b/youtube_dl/extractor/clubic.py index 98f9cb596..f0789068e 100644 --- a/youtube_dl/extractor/clubic.py +++ b/youtube_dl/extractor/clubic.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import clean_html, qualities from .common import InfoExtractor -from ..utils import ( - clean_html, - qualities, -) class ClubicIE(InfoExtractor): diff --git a/youtube_dl/extractor/clyp.py b/youtube_dl/extractor/clyp.py index 57e643799..272ee282c 100644 --- a/youtube_dl/extractor/clyp.py +++ b/youtube_dl/extractor/clyp.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import float_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - float_or_none, - parse_iso8601, -) class ClypIE(InfoExtractor): diff --git a/youtube_dl/extractor/cnbc.py b/youtube_dl/extractor/cnbc.py index d354d9f95..5a512f446 100644 --- a/youtube_dl/extractor/cnbc.py +++ b/youtube_dl/extractor/cnbc.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import smuggle_url +from .common import InfoExtractor class CNBCIE(InfoExtractor): diff --git a/youtube_dl/extractor/cnn.py b/youtube_dl/extractor/cnn.py index 5fc311f53..b191b8ea5 100644 --- a/youtube_dl/extractor/cnn.py +++ b/youtube_dl/extractor/cnn.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals import re +from ..utils import url_basename from .common import InfoExtractor from .turner import TurnerBaseIE -from ..utils import url_basename class CNNIE(TurnerBaseIE): diff --git a/youtube_dl/extractor/collegerama.py b/youtube_dl/extractor/collegerama.py index 18c734766..0d7be8694 100644 --- a/youtube_dl/extractor/collegerama.py +++ b/youtube_dl/extractor/collegerama.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import json +from ..utils import float_or_none, int_or_none, sanitized_Request from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, - sanitized_Request, -) class CollegeRamaIE(InfoExtractor): diff --git a/youtube_dl/extractor/comcarcoff.py b/youtube_dl/extractor/comcarcoff.py index 588aad0d9..b46f0156d 100644 --- a/youtube_dl/extractor/comcarcoff.py +++ b/youtube_dl/extractor/comcarcoff.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, -) +from ..utils import int_or_none, parse_duration, parse_iso8601 +from .common import InfoExtractor class ComCarCoffIE(InfoExtractor): diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index 4cac29415..d10cd0e67 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .mtv import MTVServicesInfoExtractor from .common import InfoExtractor +from .mtv import MTVServicesInfoExtractor class ComedyCentralIE(MTVServicesInfoExtractor): diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index dce8c7d0d..6596d78a7 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -4,13 +4,13 @@ import base64 import datetime import hashlib import json +import math import netrc import os import re import socket import sys import time -import math from ..compat import ( compat_cookiejar, @@ -29,37 +29,37 @@ from ..compat import ( from ..downloader.f4m import remove_encrypted_media from ..utils import ( NO_DEFAULT, + ExtractorError, + RegexNotFoundError, age_restricted, base_url, bug_reports_message, clean_html, compiled_regex_type, determine_ext, + determine_protocol, error_to_compat_str, - ExtractorError, + extract_attributes, fix_xml_ampersands, float_or_none, int_or_none, + mimetype2ext, + parse_codecs, + parse_duration, parse_iso8601, - RegexNotFoundError, + parse_m3u8_attributes, sanitize_filename, sanitized_Request, unescapeHTML, unified_strdate, unified_timestamp, + update_Request, + update_url_query, url_basename, + urljoin, xpath_element, xpath_text, xpath_with_ns, - determine_protocol, - parse_duration, - mimetype2ext, - update_Request, - update_url_query, - parse_m3u8_attributes, - extract_attributes, - parse_codecs, - urljoin, ) diff --git a/youtube_dl/extractor/commonmistakes.py b/youtube_dl/extractor/commonmistakes.py index 2f86e2381..88bceb6e0 100644 --- a/youtube_dl/extractor/commonmistakes.py +++ b/youtube_dl/extractor/commonmistakes.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class CommonMistakesIE(InfoExtractor): diff --git a/youtube_dl/extractor/commonprotocols.py b/youtube_dl/extractor/commonprotocols.py index d98331a4e..806dd2964 100644 --- a/youtube_dl/extractor/commonprotocols.py +++ b/youtube_dl/extractor/commonprotocols.py @@ -1,9 +1,7 @@ from __future__ import unicode_literals +from ..compat import compat_urlparse from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) class RtmpIE(InfoExtractor): diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py index 8d8f60598..26c4690cc 100644 --- a/youtube_dl/extractor/condenast.py +++ b/youtube_dl/extractor/condenast.py @@ -3,20 +3,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, - compat_urlparse, -) +from ..compat import compat_urllib_parse_urlparse, compat_urlparse from ..utils import ( - orderedSet, - remove_end, - extract_attributes, - mimetype2ext, determine_ext, + extract_attributes, int_or_none, + mimetype2ext, + orderedSet, parse_iso8601, + remove_end, ) +from .common import InfoExtractor class CondeNastIE(InfoExtractor): diff --git a/youtube_dl/extractor/coub.py b/youtube_dl/extractor/coub.py index 5fa1f006b..628f3c9dd 100644 --- a/youtube_dl/extractor/coub.py +++ b/youtube_dl/extractor/coub.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( ExtractorError, float_or_none, @@ -9,6 +8,7 @@ from ..utils import ( parse_iso8601, qualities, ) +from .common import InfoExtractor class CoubIE(InfoExtractor): diff --git a/youtube_dl/extractor/cracked.py b/youtube_dl/extractor/cracked.py index 94d03ce2a..5dca6ca61 100644 --- a/youtube_dl/extractor/cracked.py +++ b/youtube_dl/extractor/cracked.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_iso8601, str_to_int from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - str_to_int, -) class CrackedIE(InfoExtractor): diff --git a/youtube_dl/extractor/crackle.py b/youtube_dl/extractor/crackle.py index 377fb45e9..5d31c08ba 100644 --- a/youtube_dl/extractor/crackle.py +++ b/youtube_dl/extractor/crackle.py @@ -1,8 +1,8 @@ # coding: utf-8 -from __future__ import unicode_literals, division +from __future__ import division, unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class CrackleIE(InfoExtractor): diff --git a/youtube_dl/extractor/crooksandliars.py b/youtube_dl/extractor/crooksandliars.py index 7fb782db7..d517fb21c 100644 --- a/youtube_dl/extractor/crooksandliars.py +++ b/youtube_dl/extractor/crooksandliars.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none, qualities from .common import InfoExtractor -from ..utils import ( - int_or_none, - qualities, -) class CrooksAndLiarsIE(InfoExtractor): diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index f811c7f33..676107b13 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -1,14 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import json import base64 +import json +import re import zlib - from hashlib import sha1 -from math import pow, sqrt, floor -from .common import InfoExtractor +from math import floor, pow, sqrt + +from ..aes import aes_cbc_decrypt from ..compat import ( compat_etree_fromstring, compat_urllib_parse_urlencode, @@ -18,19 +18,17 @@ from ..compat import ( from ..utils import ( ExtractorError, bytes_to_intlist, - intlist_to_bytes, + extract_attributes, int_or_none, + intlist_to_bytes, lowercase_escape, remove_end, sanitized_Request, unified_strdate, urlencode_postdata, xpath_text, - extract_attributes, -) -from ..aes import ( - aes_cbc_decrypt, ) +from .common import InfoExtractor class CrunchyrollBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index d4576160b..51f41ed1c 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -2,15 +2,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - int_or_none, - unescapeHTML, - find_xpath_attr, - smuggle_url, - determine_ext, ExtractorError, + determine_ext, + find_xpath_attr, + int_or_none, + smuggle_url, + unescapeHTML, ) +from .common import InfoExtractor from .senateisvp import SenateISVPIE from .ustream import UstreamIE diff --git a/youtube_dl/extractor/ctsnews.py b/youtube_dl/extractor/ctsnews.py index d565335cf..0d8d523b4 100644 --- a/youtube_dl/extractor/ctsnews.py +++ b/youtube_dl/extractor/ctsnews.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import unified_timestamp +from .common import InfoExtractor class CtsNewsIE(InfoExtractor): diff --git a/youtube_dl/extractor/ctvnews.py b/youtube_dl/extractor/ctvnews.py index 55a127b76..6e7eb1e33 100644 --- a/youtube_dl/extractor/ctvnews.py +++ b/youtube_dl/extractor/ctvnews.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import orderedSet +from .common import InfoExtractor class CTVNewsIE(InfoExtractor): diff --git a/youtube_dl/extractor/cultureunplugged.py b/youtube_dl/extractor/cultureunplugged.py index bcdf27323..a3129bfce 100644 --- a/youtube_dl/extractor/cultureunplugged.py +++ b/youtube_dl/extractor/cultureunplugged.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re import time +from ..utils import HEADRequest, int_or_none from .common import InfoExtractor -from ..utils import ( - int_or_none, - HEADRequest, -) class CultureUnpluggedIE(InfoExtractor): diff --git a/youtube_dl/extractor/curiositystream.py b/youtube_dl/extractor/curiositystream.py index e3c99468c..7876f5b95 100644 --- a/youtube_dl/extractor/curiositystream.py +++ b/youtube_dl/extractor/curiositystream.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, compat_str, int_or_none, urlencode_postdata from .common import InfoExtractor -from ..utils import ( - int_or_none, - urlencode_postdata, - compat_str, - ExtractorError, -) class CuriosityStreamBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/cwtv.py b/youtube_dl/extractor/cwtv.py index 1ab9333b2..fbf2a0269 100644 --- a/youtube_dl/extractor/cwtv.py +++ b/youtube_dl/extractor/cwtv.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class CWTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/dailymail.py b/youtube_dl/extractor/dailymail.py index 98c835bf1..343ad7689 100644 --- a/youtube_dl/extractor/dailymail.py +++ b/youtube_dl/extractor/dailymail.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_protocol, int_or_none, unescapeHTML from .common import InfoExtractor -from ..utils import ( - int_or_none, - determine_protocol, - unescapeHTML, -) class DailyMailIE(InfoExtractor): diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 31bf5faf6..32dbbf675 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -1,23 +1,22 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import json import itertools - -from .common import InfoExtractor +import json +import re from ..utils import ( + ExtractorError, determine_ext, error_to_compat_str, - ExtractorError, int_or_none, + mimetype2ext, parse_iso8601, sanitized_Request, str_to_int, unescapeHTML, - mimetype2ext, ) +from .common import InfoExtractor class DailymotionBaseInfoExtractor(InfoExtractor): diff --git a/youtube_dl/extractor/daum.py b/youtube_dl/extractor/daum.py index 76f021892..54adde4a0 100644 --- a/youtube_dl/extractor/daum.py +++ b/youtube_dl/extractor/daum.py @@ -2,22 +2,17 @@ from __future__ import unicode_literals -import re import itertools +import re -from .common import InfoExtractor from ..compat import ( compat_parse_qs, compat_urllib_parse_unquote, compat_urllib_parse_urlencode, compat_urlparse, ) -from ..utils import ( - int_or_none, - str_to_int, - xpath_text, - unescapeHTML, -) +from ..utils import int_or_none, str_to_int, unescapeHTML, xpath_text +from .common import InfoExtractor class DaumIE(InfoExtractor): diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index 00fbbff2f..653237e0c 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class DctpTvIE(InfoExtractor): diff --git a/youtube_dl/extractor/deezer.py b/youtube_dl/extractor/deezer.py index ec87b94db..f72ac22b4 100644 --- a/youtube_dl/extractor/deezer.py +++ b/youtube_dl/extractor/deezer.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import json import re +from ..utils import ExtractorError, int_or_none, orderedSet from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - orderedSet, -) class DeezerPlaylistIE(InfoExtractor): diff --git a/youtube_dl/extractor/democracynow.py b/youtube_dl/extractor/democracynow.py index bdfe638b4..167a69a5a 100644 --- a/youtube_dl/extractor/democracynow.py +++ b/youtube_dl/extractor/democracynow.py @@ -1,15 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re import os.path +import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - url_basename, - remove_start, -) +from ..utils import remove_start, url_basename +from .common import InfoExtractor class DemocracynowIE(InfoExtractor): diff --git a/youtube_dl/extractor/dfb.py b/youtube_dl/extractor/dfb.py index a4d0448c2..853d67dbf 100644 --- a/youtube_dl/extractor/dfb.py +++ b/youtube_dl/extractor/dfb.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class DFBIE(InfoExtractor): diff --git a/youtube_dl/extractor/dhm.py b/youtube_dl/extractor/dhm.py index aee72a6ed..889e03d2a 100644 --- a/youtube_dl/extractor/dhm.py +++ b/youtube_dl/extractor/dhm.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import parse_duration +from .common import InfoExtractor class DHMIE(InfoExtractor): diff --git a/youtube_dl/extractor/digiteka.py b/youtube_dl/extractor/digiteka.py index 3dfde0d8c..be46ab801 100644 --- a/youtube_dl/extractor/digiteka.py +++ b/youtube_dl/extractor/digiteka.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class DigitekaIE(InfoExtractor): diff --git a/youtube_dl/extractor/discovery.py b/youtube_dl/extractor/discovery.py index 55853f76f..9293d5cb5 100644 --- a/youtube_dl/extractor/discovery.py +++ b/youtube_dl/extractor/discovery.py @@ -1,11 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, -) from ..compat import compat_str +from ..utils import parse_duration, parse_iso8601 +from .common import InfoExtractor class DiscoveryIE(InfoExtractor): diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dl/extractor/discoverygo.py index 2042493a8..2a6cab09f 100644 --- a/youtube_dl/extractor/discoverygo.py +++ b/youtube_dl/extractor/discoverygo.py @@ -1,13 +1,13 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + ExtractorError, extract_attributes, int_or_none, parse_age_limit, - ExtractorError, ) +from .common import InfoExtractor class DiscoveryGoIE(InfoExtractor): diff --git a/youtube_dl/extractor/disney.py b/youtube_dl/extractor/disney.py index 396873c6d..34585fbed 100644 --- a/youtube_dl/extractor/disney.py +++ b/youtube_dl/extractor/disney.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import compat_str, determine_ext, int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, - compat_str, - determine_ext, -) class DisneyIE(InfoExtractor): diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dl/extractor/dispeak.py index a78cb8a2a..a1bd34c1f 100644 --- a/youtube_dl/extractor/dispeak.py +++ b/youtube_dl/extractor/dispeak.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( int_or_none, parse_duration, @@ -10,6 +9,7 @@ from ..utils import ( xpath_element, xpath_text, ) +from .common import InfoExtractor class DigitallySpeakingIE(InfoExtractor): diff --git a/youtube_dl/extractor/dotsub.py b/youtube_dl/extractor/dotsub.py index 1f75352ca..1cf7ff563 100644 --- a/youtube_dl/extractor/dotsub.py +++ b/youtube_dl/extractor/dotsub.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import float_or_none, int_or_none from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, -) class DotsubIE(InfoExtractor): diff --git a/youtube_dl/extractor/douyutv.py b/youtube_dl/extractor/douyutv.py index 2f3c5113e..b35b383b9 100644 --- a/youtube_dl/extractor/douyutv.py +++ b/youtube_dl/extractor/douyutv.py @@ -5,15 +5,9 @@ import hashlib import time import uuid +from ..compat import compat_str, compat_urllib_parse_urlencode +from ..utils import ExtractorError, unescapeHTML from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) -from ..utils import ( - ExtractorError, - unescapeHTML, -) class DouyuTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/dplay.py b/youtube_dl/extractor/dplay.py index 32028bc3b..e18997e19 100644 --- a/youtube_dl/extractor/dplay.py +++ b/youtube_dl/extractor/dplay.py @@ -5,13 +5,9 @@ import json import re import time -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - USER_AGENTS, - int_or_none, - update_url_query, -) +from ..utils import USER_AGENTS, int_or_none, update_url_query +from .common import InfoExtractor class DPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/dramafever.py b/youtube_dl/extractor/dramafever.py index bcd9fe2a0..99defec60 100644 --- a/youtube_dl/extractor/dramafever.py +++ b/youtube_dl/extractor/dramafever.py @@ -3,18 +3,15 @@ from __future__ import unicode_literals import itertools -from .amp import AMPIE -from ..compat import ( - compat_HTTPError, - compat_urlparse, -) +from ..compat import compat_HTTPError, compat_urlparse from ..utils import ( ExtractorError, clean_html, int_or_none, sanitized_Request, - urlencode_postdata + urlencode_postdata, ) +from .amp import AMPIE class DramaFeverBaseIE(AMPIE): diff --git a/youtube_dl/extractor/drbonanza.py b/youtube_dl/extractor/drbonanza.py index 79ec212c8..fb12e5db0 100644 --- a/youtube_dl/extractor/drbonanza.py +++ b/youtube_dl/extractor/drbonanza.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import json import re +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class DRBonanzaIE(InfoExtractor): diff --git a/youtube_dl/extractor/dreisat.py b/youtube_dl/extractor/dreisat.py index f138025d5..60c7979b3 100644 --- a/youtube_dl/extractor/dreisat.py +++ b/youtube_dl/extractor/dreisat.py @@ -2,16 +2,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( + ExtractorError, + determine_ext, + float_or_none, int_or_none, + qualities, unified_strdate, xpath_text, - determine_ext, - qualities, - float_or_none, - ExtractorError, ) +from .common import InfoExtractor class DreiSatIE(InfoExtractor): diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dl/extractor/dropbox.py index 14b6c00b0..57f852361 100644 --- a/youtube_dl/extractor/dropbox.py +++ b/youtube_dl/extractor/dropbox.py @@ -4,9 +4,9 @@ from __future__ import unicode_literals import os.path import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote from ..utils import url_basename +from .common import InfoExtractor class DropboxIE(InfoExtractor): diff --git a/youtube_dl/extractor/drtuber.py b/youtube_dl/extractor/drtuber.py index 1eca82b3b..17ebe83f0 100644 --- a/youtube_dl/extractor/drtuber.py +++ b/youtube_dl/extractor/drtuber.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import NO_DEFAULT, str_to_int from .common import InfoExtractor -from ..utils import ( - NO_DEFAULT, - str_to_int, -) class DrTuberIE(InfoExtractor): diff --git a/youtube_dl/extractor/drtv.py b/youtube_dl/extractor/drtv.py index 88d096b30..756380320 100644 --- a/youtube_dl/extractor/drtv.py +++ b/youtube_dl/extractor/drtv.py @@ -1,15 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( ExtractorError, - int_or_none, float_or_none, + int_or_none, mimetype2ext, parse_iso8601, remove_end, ) +from .common import InfoExtractor class DRTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index c9fc9b5a9..1d0e23710 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -4,11 +4,8 @@ from __future__ import unicode_literals import base64 import re +from ..utils import qualities, sanitized_Request from .common import InfoExtractor -from ..utils import ( - qualities, - sanitized_Request, -) class DumpertIE(InfoExtractor): diff --git a/youtube_dl/extractor/dvtv.py b/youtube_dl/extractor/dvtv.py index 974c69dbc..d3a5da177 100644 --- a/youtube_dl/extractor/dvtv.py +++ b/youtube_dl/extractor/dvtv.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, js_to_json, unescapeHTML from .common import InfoExtractor -from ..utils import ( - js_to_json, - unescapeHTML, - ExtractorError, -) class DVTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/dw.py b/youtube_dl/extractor/dw.py index d740652f1..c447d703c 100644 --- a/youtube_dl/extractor/dw.py +++ b/youtube_dl/extractor/dw.py @@ -1,12 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) from ..compat import compat_urlparse +from ..utils import int_or_none, unified_strdate +from .common import InfoExtractor class DWIE(InfoExtractor): diff --git a/youtube_dl/extractor/eagleplatform.py b/youtube_dl/extractor/eagleplatform.py index 76d39adac..85a8af46d 100644 --- a/youtube_dl/extractor/eagleplatform.py +++ b/youtube_dl/extractor/eagleplatform.py @@ -3,15 +3,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_HTTPError, compat_str +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, -) -from ..utils import ( - ExtractorError, - int_or_none, -) class EaglePlatformIE(InfoExtractor): diff --git a/youtube_dl/extractor/ehow.py b/youtube_dl/extractor/ehow.py index b1cd4f5d4..ec15eb179 100644 --- a/youtube_dl/extractor/ehow.py +++ b/youtube_dl/extractor/ehow.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class EHowIE(InfoExtractor): diff --git a/youtube_dl/extractor/eighttracks.py b/youtube_dl/extractor/eighttracks.py index 9a44f89f3..0c2a69bdc 100644 --- a/youtube_dl/extractor/eighttracks.py +++ b/youtube_dl/extractor/eighttracks.py @@ -4,13 +4,9 @@ from __future__ import unicode_literals import json import random +from ..compat import compat_str +from ..utils import ExtractorError from .common import InfoExtractor -from ..compat import ( - compat_str, -) -from ..utils import ( - ExtractorError, -) class EightTracksIE(InfoExtractor): diff --git a/youtube_dl/extractor/einthusan.py b/youtube_dl/extractor/einthusan.py index 6ca07a13d..3414cce87 100644 --- a/youtube_dl/extractor/einthusan.py +++ b/youtube_dl/extractor/einthusan.py @@ -1,12 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - remove_start, - sanitized_Request, -) +from ..utils import remove_start, sanitized_Request +from .common import InfoExtractor class EinthusanIE(InfoExtractor): diff --git a/youtube_dl/extractor/eitb.py b/youtube_dl/extractor/eitb.py index ee5ead18b..d3e2e81eb 100644 --- a/youtube_dl/extractor/eitb.py +++ b/youtube_dl/extractor/eitb.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( float_or_none, int_or_none, parse_iso8601, sanitized_Request, ) +from .common import InfoExtractor class EitbIE(InfoExtractor): diff --git a/youtube_dl/extractor/ellentv.py b/youtube_dl/extractor/ellentv.py index 74bbc5c51..83958c136 100644 --- a/youtube_dl/extractor/ellentv.py +++ b/youtube_dl/extractor/ellentv.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import NO_DEFAULT, ExtractorError from .common import InfoExtractor -from ..utils import ( - ExtractorError, - NO_DEFAULT, -) class EllenTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/elpais.py b/youtube_dl/extractor/elpais.py index 8c725a4e6..1ac9c93cc 100644 --- a/youtube_dl/extractor/elpais.py +++ b/youtube_dl/extractor/elpais.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class ElPaisIE(InfoExtractor): diff --git a/youtube_dl/extractor/embedly.py b/youtube_dl/extractor/embedly.py index a5820b21e..0a90fc79a 100644 --- a/youtube_dl/extractor/embedly.py +++ b/youtube_dl/extractor/embedly.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class EmbedlyIE(InfoExtractor): diff --git a/youtube_dl/extractor/eporner.py b/youtube_dl/extractor/eporner.py index f3734e9f8..2fd731bff 100644 --- a/youtube_dl/extractor/eporner.py +++ b/youtube_dl/extractor/eporner.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - encode_base_n, ExtractorError, + encode_base_n, int_or_none, parse_duration, str_to_int, ) +from .common import InfoExtractor class EpornerIE(InfoExtractor): diff --git a/youtube_dl/extractor/eroprofile.py b/youtube_dl/extractor/eroprofile.py index c08643a17..483f1f5e3 100644 --- a/youtube_dl/extractor/eroprofile.py +++ b/youtube_dl/extractor/eroprofile.py @@ -2,12 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlencode -from ..utils import ( - ExtractorError, - unescapeHTML -) +from ..utils import ExtractorError, unescapeHTML +from .common import InfoExtractor class EroProfileIE(InfoExtractor): diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py index 4d8a3c134..f0c54c9d2 100644 --- a/youtube_dl/extractor/escapist.py +++ b/youtube_dl/extractor/escapist.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals import json -from .common import InfoExtractor from ..utils import ( - determine_ext, clean_html, - int_or_none, + determine_ext, float_or_none, + int_or_none, sanitized_Request, ) +from .common import InfoExtractor def _decrypt_config(key, string): diff --git a/youtube_dl/extractor/espn.py b/youtube_dl/extractor/espn.py index 8795e0ddf..b733072a8 100644 --- a/youtube_dl/extractor/espn.py +++ b/youtube_dl/extractor/espn.py @@ -1,12 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - int_or_none, - unified_timestamp, -) +from ..utils import determine_ext, int_or_none, unified_timestamp +from .common import InfoExtractor class ESPNIE(InfoExtractor): diff --git a/youtube_dl/extractor/esri.py b/youtube_dl/extractor/esri.py index e9dcaeb1d..875e3a4fd 100644 --- a/youtube_dl/extractor/esri.py +++ b/youtube_dl/extractor/esri.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - parse_filesize, - unified_strdate, -) +from ..utils import int_or_none, parse_filesize, unified_strdate +from .common import InfoExtractor class EsriVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/europa.py b/youtube_dl/extractor/europa.py index 1efc0b2ec..7c342712d 100644 --- a/youtube_dl/extractor/europa.py +++ b/youtube_dl/extractor/europa.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( int_or_none, @@ -9,8 +8,9 @@ from ..utils import ( parse_duration, qualities, unified_strdate, - xpath_text + xpath_text, ) +from .common import InfoExtractor class EuropaIE(InfoExtractor): diff --git a/youtube_dl/extractor/everyonesmixtape.py b/youtube_dl/extractor/everyonesmixtape.py index 84a9b750e..3f143d847 100644 --- a/youtube_dl/extractor/everyonesmixtape.py +++ b/youtube_dl/extractor/everyonesmixtape.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, sanitized_Request from .common import InfoExtractor -from ..utils import ( - ExtractorError, - sanitized_Request, -) class EveryonesMixtapeIE(InfoExtractor): diff --git a/youtube_dl/extractor/expotv.py b/youtube_dl/extractor/expotv.py index 95a897782..00e924b6e 100644 --- a/youtube_dl/extractor/expotv.py +++ b/youtube_dl/extractor/expotv.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) class ExpoTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 086a2296d..9904d8fc2 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1,115 +1,75 @@ # flake8: noqa from __future__ import unicode_literals -from .abc import ( - ABCIE, - ABCIViewIE, -) -from .abcnews import ( - AbcNewsIE, - AbcNewsVideoIE, -) -from .abcotvs import ( - ABCOTVSIE, - ABCOTVSClipsIE, -) +from .abc import ABCIE, ABCIViewIE +from .abcnews import AbcNewsIE, AbcNewsVideoIE +from .abcotvs import ABCOTVSIE, ABCOTVSClipsIE from .academicearth import AcademicEarthCourseIE -from .acast import ( - ACastIE, - ACastChannelIE, -) +from .acast import ACastChannelIE, ACastIE from .addanime import AddAnimeIE -from .adobetv import ( - AdobeTVIE, - AdobeTVShowIE, - AdobeTVChannelIE, - AdobeTVVideoIE, -) +from .adobetv import AdobeTVChannelIE, AdobeTVIE, AdobeTVShowIE, AdobeTVVideoIE from .adultswim import AdultSwimIE -from .aenetworks import ( - AENetworksIE, - HistoryTopicIE, -) -from .afreecatv import ( - AfreecaTVIE, - AfreecaTVGlobalIE, -) +from .aenetworks import AENetworksIE, HistoryTopicIE +from .afreecatv import AfreecaTVGlobalIE, AfreecaTVIE from .airmozilla import AirMozillaIE from .aljazeera import AlJazeeraIE +from .allocine import AllocineIE from .alphaporno import AlphaPornoIE from .amcnetworks import AMCNetworksIE from .animeondemand import AnimeOnDemandIE from .anitube import AnitubeIE from .anysex import AnySexIE from .aol import AolIE -from .allocine import AllocineIE from .aparat import AparatIE from .appleconnect import AppleConnectIE -from .appletrailers import ( - AppleTrailersIE, - AppleTrailersSectionIE, -) +from .appletrailers import AppleTrailersIE, AppleTrailersSectionIE from .archiveorg import ArchiveOrgIE +from .ard import ARDIE, ARDMediathekIE from .arkena import ArkenaIE -from .ard import ( - ARDIE, - ARDMediathekIE, -) from .arte import ( - ArteTvIE, - ArteTVPlus7IE, - ArteTVCreativeIE, - ArteTVConcertIE, - ArteTVInfoIE, - ArteTVFutureIE, ArteTVCinemaIE, + ArteTVConcertIE, + ArteTVCreativeIE, ArteTVDDCIE, - ArteTVMagazineIE, ArteTVEmbedIE, - TheOperaPlatformIE, + ArteTVFutureIE, + ArteTvIE, + ArteTVInfoIE, + ArteTVMagazineIE, ArteTVPlaylistIE, + ArteTVPlus7IE, + TheOperaPlatformIE, ) from .atresplayer import AtresPlayerIE from .atttechchannel import ATTTechChannelIE from .audimedia import AudiMediaIE from .audioboom import AudioBoomIE -from .audiomack import AudiomackIE, AudiomackAlbumIE -from .awaan import ( - AWAANIE, - AWAANVideoIE, - AWAANLiveIE, - AWAANSeasonIE, -) -from .azmedien import ( - AZMedienIE, - AZMedienShowIE, -) +from .audiomack import AudiomackAlbumIE, AudiomackIE +from .awaan import AWAANIE, AWAANLiveIE, AWAANSeasonIE, AWAANVideoIE +from .azmedien import AZMedienIE, AZMedienShowIE from .azubu import AzubuIE, AzubuLiveIE from .baidu import BaiduVideoIE -from .bambuser import BambuserIE, BambuserChannelIE -from .bandcamp import BandcampIE, BandcampAlbumIE +from .bambuser import BambuserChannelIE, BambuserIE +from .bandcamp import BandcampAlbumIE, BandcampIE from .bbc import ( - BBCCoUkIE, + BBCIE, BBCCoUkArticleIE, + BBCCoUkIE, BBCCoUkIPlayerPlaylistIE, BBCCoUkPlaylistIE, - BBCIE, ) from .beampro import BeamProLiveIE +from .beatport import BeatportIE from .beeg import BeegIE from .behindkink import BehindKinkIE from .bellmedia import BellMediaIE -from .beatport import BeatportIE from .bet import BetIE from .bigflix import BigflixIE from .bild import BildIE from .bilibili import BiliBiliIE from .biobiochiletv import BioBioChileTVIE from .biqle import BIQLEIE -from .bleacherreport import ( - BleacherReportIE, - BleacherReportCMSIE, -) +from .bleacherreport import BleacherReportCMSIE, BleacherReportIE from .blinkx import BlinkxIE from .bloomberg import BloombergIE from .bokecc import BokeCCIE @@ -117,42 +77,22 @@ from .bpb import BpbIE from .br import BRIE from .bravotv import BravoTVIE from .breakcom import BreakIE -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, -) +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE from .buzzfeed import BuzzFeedIE -from .byutv import ( - BYUtvIE, - BYUtvEventIE, -) +from .byutv import BYUtvEventIE, BYUtvIE from .c56 import C56IE -from .camdemy import ( - CamdemyIE, - CamdemyFolderIE -) +from .camdemy import CamdemyFolderIE, CamdemyIE from .camwithher import CamWithHerIE -from .canalplus import CanalplusIE from .canalc2 import Canalc2IE +from .canalplus import CanalplusIE from .canvas import CanvasIE -from .carambatv import ( - CarambaTVIE, - CarambaTVPageIE, -) +from .carambatv import CarambaTVIE, CarambaTVPageIE from .cartoonnetwork import CartoonNetworkIE -from .cbc import ( - CBCIE, - CBCPlayerIE, - CBCWatchVideoIE, - CBCWatchIE, -) +from .cbc import CBCIE, CBCPlayerIE, CBCWatchIE, CBCWatchVideoIE from .cbs import CBSIE -from .cbslocal import CBSLocalIE from .cbsinteractive import CBSInteractiveIE -from .cbsnews import ( - CBSNewsIE, - CBSNewsLiveVideoIE, -) +from .cbslocal import CBSLocalIE +from .cbsnews import CBSNewsIE, CBSNewsLiveVideoIE from .cbssports import CBSSportsIE from .ccc import CCCIE from .ccma import CCMAIE @@ -163,10 +103,7 @@ from .channel9 import Channel9IE from .charlierose import CharlieRoseIE from .chaturbate import ChaturbateIE from .chilloutzone import ChilloutzoneIE -from .chirbit import ( - ChirbitIE, - ChirbitProfileIE, -) +from .chirbit import ChirbitIE, ChirbitProfileIE from .cinchcast import CinchcastIE from .clipfish import ClipfishIE from .cliphunter import CliphunterIE @@ -178,13 +115,9 @@ from .clubic import ClubicIE from .clyp import ClypIE from .cmt import CMTIE from .cnbc import CNBCIE -from .cnn import ( - CNNIE, - CNNBlogsIE, - CNNArticleIE, -) -from .coub import CoubIE +from .cnn import CNNIE, CNNArticleIE, CNNBlogsIE from .collegerama import CollegeRamaIE +from .comcarcoff import ComCarCoffIE from .comedycentral import ( ComedyCentralFullEpisodesIE, ComedyCentralIE, @@ -192,72 +125,53 @@ from .comedycentral import ( ComedyCentralTVIE, ToshIE, ) -from .comcarcoff import ComCarCoffIE from .commonmistakes import CommonMistakesIE, UnicodeBOMIE -from .commonprotocols import ( - MmsIE, - RtmpIE, -) +from .commonprotocols import MmsIE, RtmpIE from .condenast import CondeNastIE +from .coub import CoubIE from .cracked import CrackedIE from .crackle import CrackleIE from .criterion import CriterionIE from .crooksandliars import CrooksAndLiarsIE -from .crunchyroll import ( - CrunchyrollIE, - CrunchyrollShowPlaylistIE -) +from .crunchyroll import CrunchyrollIE, CrunchyrollShowPlaylistIE from .cspan import CSpanIE from .ctsnews import CtsNewsIE from .ctvnews import CTVNewsIE from .cultureunplugged import CultureUnpluggedIE -from .curiositystream import ( - CuriosityStreamIE, - CuriosityStreamCollectionIE, -) +from .curiositystream import CuriosityStreamCollectionIE, CuriosityStreamIE from .cwtv import CWTVIE from .dailymail import DailyMailIE from .dailymotion import ( + DailymotionCloudIE, DailymotionIE, DailymotionPlaylistIE, DailymotionUserIE, - DailymotionCloudIE, -) -from .daum import ( - DaumIE, - DaumClipIE, - DaumPlaylistIE, - DaumUserIE, ) +from .daum import DaumClipIE, DaumIE, DaumPlaylistIE, DaumUserIE from .dbtv import DBTVIE from .dctp import DctpTvIE from .deezer import DeezerPlaylistIE +from .defense import DefenseGouvFrIE from .democracynow import DemocracynowIE from .dfb import DFBIE from .dhm import DHMIE -from .dotsub import DotsubIE -from .douyutv import DouyuTVIE -from .dplay import DPlayIE -from .dramafever import ( - DramaFeverIE, - DramaFeverSeriesIE, -) -from .dreisat import DreiSatIE -from .drbonanza import DRBonanzaIE -from .drtuber import DrTuberIE -from .drtv import DRTVIE -from .dvtv import DVTVIE -from .dumpert import DumpertIE -from .defense import DefenseGouvFrIE +from .digiteka import DigitekaIE from .discovery import DiscoveryIE from .discoverygo import DiscoveryGoIE from .disney import DisneyIE from .dispeak import DigitallySpeakingIE +from .dotsub import DotsubIE +from .douyutv import DouyuTVIE +from .dplay import DPlayIE +from .dramafever import DramaFeverIE, DramaFeverSeriesIE +from .drbonanza import DRBonanzaIE +from .dreisat import DreiSatIE from .dropbox import DropboxIE -from .dw import ( - DWIE, - DWArticleIE, -) +from .drtuber import DrTuberIE +from .drtv import DRTVIE +from .dumpert import DumpertIE +from .dvtv import DVTVIE +from .dw import DWIE, DWArticleIE from .eagleplatform import EaglePlatformIE from .ebaumsworld import EbaumsWorldIE from .echomsk import EchoMskIE @@ -266,35 +180,23 @@ from .ehow import EHowIE from .eighttracks import EightTracksIE from .einthusan import EinthusanIE from .eitb import EitbIE -from .ellentv import ( - EllenTVIE, - EllenTVClipsIE, -) +from .ellentv import EllenTVClipsIE, EllenTVIE from .elpais import ElPaisIE from .embedly import EmbedlyIE from .engadget import EngadgetIE from .eporner import EpornerIE from .eroprofile import EroProfileIE from .escapist import EscapistIE -from .espn import ( - ESPNIE, - ESPNArticleIE, -) +from .espn import ESPNIE, ESPNArticleIE from .esri import EsriVideoIE from .europa import EuropaIE from .everyonesmixtape import EveryonesMixtapeIE from .expotv import ExpoTVIE from .extremetube import ExtremeTubeIE from .eyedotv import EyedoTVIE -from .facebook import ( - FacebookIE, - FacebookPluginsVideoIE, -) +from .facebook import FacebookIE, FacebookPluginsVideoIE from .faz import FazIE -from .fc2 import ( - FC2IE, - FC2EmbedIE, -) +from .fc2 import FC2IE, FC2EmbedIE from .fczenit import FczenitIE from .firstpost import FirstpostIE from .firsttv import FirstTVIE @@ -310,20 +212,16 @@ from .fourtube import FourTubeIE from .fox import FOXIE from .fox9 import FOX9IE from .foxgay import FoxgayIE -from .foxnews import ( - FoxNewsIE, - FoxNewsArticleIE, - FoxNewsInsiderIE, -) +from .foxnews import FoxNewsArticleIE, FoxNewsIE, FoxNewsInsiderIE from .foxsports import FoxSportsIE from .franceculture import FranceCultureIE from .franceinter import FranceInterIE from .francetv import ( - PluzzIE, - FranceTvInfoIE, - FranceTVIE, - GenerationQuoiIE, CultureboxIE, + FranceTVIE, + FranceTvInfoIE, + GenerationQuoiIE, + PluzzIE, ) from .freesound import FreesoundIE from .freespeech import FreespeechIE @@ -332,10 +230,7 @@ from .funnyordie import FunnyOrDieIE from .fusion import FusionIE from .fxnetworks import FXNetworksIE from .gameinformer import GameInformerIE -from .gameone import ( - GameOneIE, - GameOnePlaylistIE, -) +from .gameone import GameOneIE, GameOnePlaylistIE from .gamersyde import GamersydeIE from .gamespot import GameSpotIE from .gamestar import GameStarIE @@ -346,10 +241,7 @@ from .gfycat import GfycatIE from .giantbomb import GiantBombIE from .giga import GigaIE from .glide import GlideIE -from .globo import ( - GloboIE, - GloboArticleIE, -) +from .globo import GloboArticleIE, GloboIE from .go import GoIE from .godtube import GodTubeIE from .godtv import GodTVIE @@ -361,19 +253,13 @@ from .goshgay import GoshgayIE from .gputechconf import GPUTechConfIE from .groupon import GrouponIE from .hark import HarkIE -from .hbo import ( - HBOIE, - HBOEpisodeIE, -) +from .hbo import HBOIE, HBOEpisodeIE from .hearthisat import HearThisAtIE from .heise import HeiseIE from .hellporno import HellPornoIE from .helsinki import HelsinkiIE from .hentaistigma import HentaiStigmaIE -from .hgtv import ( - HGTVIE, - HGTVComShowIE, -) +from .hgtv import HGTVIE, HGTVComShowIE from .historicfilms import HistoricFilmsIE from .hitbox import HitboxIE, HitboxLiveIE from .hitrecord import HitRecordIE @@ -382,33 +268,17 @@ from .hotnewhiphop import HotNewHipHopIE from .hotstar import HotStarIE from .howcast import HowcastIE from .howstuffworks import HowStuffWorksIE -from .hrti import ( - HRTiIE, - HRTiPlaylistIE, -) +from .hrti import HRTiIE, HRTiPlaylistIE from .huajiao import HuajiaoIE from .huffpost import HuffPostIE from .hypem import HypemIE from .iconosquare import IconosquareIE -from .ign import ( - IGNIE, - OneUPIE, - PCMagIE, -) -from .imdb import ( - ImdbIE, - ImdbListIE -) -from .imgur import ( - ImgurIE, - ImgurAlbumIE, -) +from .ign import IGNIE, OneUPIE, PCMagIE +from .imdb import ImdbIE, ImdbListIE +from .imgur import ImgurAlbumIE, ImgurIE from .ina import InaIE from .inc import IncIE -from .indavideo import ( - IndavideoIE, - IndavideoEmbedIE, -) +from .indavideo import IndavideoEmbedIE, IndavideoIE from .infoq import InfoQIE from .instagram import InstagramIE, InstagramUserIE from .internetvideoarchive import InternetVideoArchiveIE @@ -416,74 +286,55 @@ from .iprima import IPrimaIE from .iqiyi import IqiyiIE from .ir90tv import Ir90TvIE from .itv import ITVIE -from .ivi import ( - IviIE, - IviCompilationIE -) +from .ivi import IviCompilationIE, IviIE from .ivideon import IvideonIE from .iwara import IwaraIE from .izlesene import IzleseneIE -from .jamendo import ( - JamendoIE, - JamendoAlbumIE, -) +from .jamendo import JamendoAlbumIE, JamendoIE from .jeuxvideo import JeuxVideoIE from .jove import JoveIE -from .jwplatform import JWPlatformIE from .jpopsukitv import JpopsukiIE +from .jwplatform import JWPlatformIE from .kaltura import KalturaIE from .kamcord import KamcordIE from .kanalplay import KanalPlayIE from .kankan import KankanIE from .karaoketv import KaraoketvIE from .karrierevideos import KarriereVideosIE +from .keek import KeekIE from .keezmovies import KeezMoviesIE from .ketnet import KetnetIE from .khanacademy import KhanAcademyIE from .kickstarter import KickStarterIE -from .keek import KeekIE from .konserthusetplay import KonserthusetPlayIE from .kontrtube import KontrTubeIE from .krasview import KrasViewIE from .ku6 import Ku6IE from .kusi import KUSIIE from .kuwo import ( - KuwoIE, KuwoAlbumIE, - KuwoChartIE, - KuwoSingerIE, KuwoCategoryIE, + KuwoChartIE, + KuwoIE, KuwoMvIE, + KuwoSingerIE, ) from .la7 import LA7IE -from .laola1tv import ( - Laola1TvEmbedIE, - Laola1TvIE, -) +from .laola1tv import Laola1TvEmbedIE, Laola1TvIE from .lci import LCIIE -from .lcp import ( - LcpPlayIE, - LcpIE, -) +from .lcp import LcpIE, LcpPlayIE from .learnr import LearnrIE from .lecture2go import Lecture2GoIE +from .leeco import LeIE, LePlaylistIE, LetvCloudIE from .lego import LEGOIE from .lemonde import LemondeIE -from .leeco import ( - LeIE, - LePlaylistIE, - LetvCloudIE, -) from .libraryofcongress import LibraryOfCongressIE from .libsyn import LibsynIE -from .lifenews import ( - LifeNewsIE, - LifeEmbedIE, -) +from .lifenews import LifeEmbedIE, LifeNewsIE from .limelight import ( - LimelightMediaIE, LimelightChannelIE, LimelightChannelListIE, + LimelightMediaIE, ) from .litv import LiTVIE from .liveleak import LiveLeakIE @@ -496,19 +347,13 @@ from .lnkgo import LnkGoIE from .localnews8 import LocalNews8IE from .lovehomeporn import LoveHomePornIE from .lrt import LRTIE -from .lynda import ( - LyndaIE, - LyndaCourseIE -) +from .lynda import LyndaCourseIE, LyndaIE from .m6 import M6IE from .macgamestore import MacGameStoreIE from .mailru import MailRuIE from .makerschannel import MakersChannelIE from .makertv import MakerTVIE -from .mangomolo import ( - MangomoloVideoIE, - MangomoloLiveIE, -) +from .mangomolo import MangomoloLiveIE, MangomoloVideoIE from .matchtv import MatchTVIE from .mdr import MDRIE from .meipai import MeipaiIE @@ -520,24 +365,23 @@ from .mgoon import MgoonIE from .mgtv import MGTVIE from .miaopai import MiaoPaiIE from .microsoftvirtualacademy import ( - MicrosoftVirtualAcademyIE, MicrosoftVirtualAcademyCourseIE, + MicrosoftVirtualAcademyIE, ) from .minhateca import MinhatecaIE from .ministrygrid import MinistryGridIE from .minoto import MinotoIE from .miomio import MioMioIE -from .mit import TechTVMITIE, MITIE, OCWMITIE +from .mit import MITIE, OCWMITIE, TechTVMITIE from .mitele import MiTeleIE from .mixcloud import ( MixcloudIE, - MixcloudUserIE, MixcloudPlaylistIE, MixcloudStreamIE, + MixcloudUserIE, ) from .mlb import MLBIE from .mnet import MnetIE -from .mpora import MporaIE from .moevideo import MoeVideoIE from .mofosex import MofosexIE from .mojvideo import MojvideoIE @@ -548,26 +392,21 @@ from .motorsport import MotorsportIE from .movieclips import MovieClipsIE from .moviezine import MoviezineIE from .movingimage import MovingImageIE +from .mpora import MporaIE from .msn import MSNIE -from .mtv import ( - MTVIE, - MTVVideoIE, - MTVServicesEmbeddedIE, - MTVDEIE, - MTV81IE, -) +from .mtv import MTV81IE, MTVDEIE, MTVIE, MTVServicesEmbeddedIE, MTVVideoIE from .muenchentv import MuenchenTVIE from .musicplayon import MusicPlayOnIE from .mwave import MwaveIE, MwaveMeetGreetIE -from .myspace import MySpaceIE, MySpaceAlbumIE +from .myspace import MySpaceAlbumIE, MySpaceIE from .myspass import MySpassIE from .myvi import MyviIE from .myvideo import MyVideoIE from .myvidster import MyVidsterIE from .nationalgeographic import ( - NationalGeographicVideoIE, - NationalGeographicIE, NationalGeographicEpisodeGuideIE, + NationalGeographicIE, + NationalGeographicVideoIE, ) from .naver import NaverIE from .nba import NBAIE @@ -579,52 +418,34 @@ from .nbc import ( NBCSportsIE, NBCSportsVPlayerIE, ) -from .ndr import ( - NDRIE, - NJoyIE, - NDREmbedBaseIE, - NDREmbedIE, - NJoyEmbedIE, -) +from .ndr import NDRIE, NDREmbedBaseIE, NDREmbedIE, NJoyEmbedIE, NJoyIE from .ndtv import NDTVIE -from .netzkino import NetzkinoIE from .nerdcubed import NerdCubedFeedIE from .neteasemusic import ( - NetEaseMusicIE, NetEaseMusicAlbumIE, - NetEaseMusicSingerIE, + NetEaseMusicDjRadioIE, + NetEaseMusicIE, NetEaseMusicListIE, NetEaseMusicMvIE, NetEaseMusicProgramIE, - NetEaseMusicDjRadioIE, + NetEaseMusicSingerIE, ) +from .netzkino import NetzkinoIE from .newgrounds import NewgroundsIE from .newstube import NewstubeIE from .nextmedia import ( - NextMediaIE, - NextMediaActionNewsIE, AppleDailyIE, + NextMediaActionNewsIE, + NextMediaIE, NextTVIE, ) from .nfb import NFBIE from .nfl import NFLIE from .nhk import NhkVodIE -from .nhl import ( - NHLVideocenterIE, - NHLNewsIE, - NHLVideocenterCategoryIE, - NHLIE, -) -from .nick import ( - NickIE, - NickDeIE, - NickNightIE, -) +from .nhl import NHLIE, NHLNewsIE, NHLVideocenterCategoryIE, NHLVideocenterIE +from .nick import NickDeIE, NickIE, NickNightIE from .niconico import NiconicoIE, NiconicoPlaylistIE -from .ninecninemedia import ( - NineCNineMediaStackIE, - NineCNineMediaIE, -) +from .ninecninemedia import NineCNineMediaIE, NineCNineMediaStackIE from .ninegag import NineGagIE from .ninenow import NineNowIE from .nintendo import NintendoIE @@ -640,74 +461,50 @@ from .novamov import ( VideoWeedIE, WholeCloudIE, ) -from .nowness import ( - NownessIE, - NownessPlaylistIE, - NownessSeriesIE, -) -from .nowtv import ( - NowTVIE, - NowTVListIE, -) +from .nowness import NownessIE, NownessPlaylistIE, NownessSeriesIE +from .nowtv import NowTVIE, NowTVListIE from .noz import NozIE from .npo import ( - AndereTijdenIE, NPOIE, - NPOLiveIE, - NPORadioIE, - NPORadioFragmentIE, - SchoolTVIE, VPROIE, WNLIE, + AndereTijdenIE, + NPOLiveIE, + NPORadioFragmentIE, + NPORadioIE, + SchoolTVIE, ) from .npr import NprIE from .nrk import ( NRKIE, + NRKTVIE, NRKPlaylistIE, NRKSkoleIE, - NRKTVIE, NRKTVDirekteIE, NRKTVEpisodesIE, ) from .ntvde import NTVDeIE from .ntvru import NTVRuIE -from .nytimes import ( - NYTimesIE, - NYTimesArticleIE, -) from .nuvid import NuvidIE +from .nytimes import NYTimesArticleIE, NYTimesIE from .nzz import NZZIE from .odatv import OdaTVIE from .odnoklassniki import OdnoklassnikiIE from .oktoberfesttv import OktoberfestTVIE from .ondemandkorea import OnDemandKoreaIE -from .onet import ( - OnetIE, - OnetChannelIE, -) +from .onet import OnetChannelIE, OnetIE from .onionstudios import OnionStudiosIE -from .ooyala import ( - OoyalaIE, - OoyalaExternalIE, -) +from .ooyala import OoyalaExternalIE, OoyalaIE from .openload import OpenloadIE from .ora import OraTVIE -from .orf import ( - ORFTVthekIE, - ORFOE1IE, - ORFFM4IE, - ORFIPTVIE, -) +from .orf import ORFFM4IE, ORFIPTVIE, ORFOE1IE, ORFTVthekIE from .pandatv import PandaTVIE from .pandoratv import PandoraTVIE from .parliamentliveuk import ParliamentLiveUKIE from .patreon import PatreonIE from .pbs import PBSIE from .people import PeopleIE -from .periscope import ( - PeriscopeIE, - PeriscopeUserIE, -) +from .periscope import PeriscopeIE, PeriscopeUserIE from .philharmoniedeparis import PhilharmonieDeParisIE from .phoenix import PhoenixIE from .photobucket import PhotobucketIE @@ -719,25 +516,15 @@ from .plays import PlaysTVIE from .playtvak import PlaytvakIE from .playvid import PlayvidIE from .playwire import PlaywireIE -from .pluralsight import ( - PluralsightIE, - PluralsightCourseIE, -) +from .pluralsight import PluralsightCourseIE, PluralsightIE from .podomatic import PodomaticIE from .pokemon import PokemonIE -from .polskieradio import ( - PolskieRadioIE, - PolskieRadioCategoryIE, -) +from .polskieradio import PolskieRadioCategoryIE, PolskieRadioIE from .porn91 import Porn91IE from .porncom import PornComIE from .pornflip import PornFlipIE from .pornhd import PornHdIE -from .pornhub import ( - PornHubIE, - PornHubPlaylistIE, - PornHubUserVideosIE, -) +from .pornhub import PornHubIE, PornHubPlaylistIE, PornHubUserVideosIE from .pornotube import PornotubeIE from .pornovoisines import PornoVoisinesIE from .pornoxo import PornoXOIE @@ -748,43 +535,28 @@ from .prosiebensat1 import ProSiebenSat1IE from .puls4 import Puls4IE from .pyvideo import PyvideoIE from .qqmusic import ( - QQMusicIE, - QQMusicSingerIE, QQMusicAlbumIE, - QQMusicToplistIE, + QQMusicIE, QQMusicPlaylistIE, + QQMusicSingerIE, + QQMusicToplistIE, ) -from .r7 import ( - R7IE, - R7ArticleIE, -) -from .radiocanada import ( - RadioCanadaIE, - RadioCanadaAudioVideoIE, -) -from .radiode import RadioDeIE -from .radiojavan import RadioJavanIE +from .r7 import R7IE, R7ArticleIE from .radiobremen import RadioBremenIE +from .radiocanada import RadioCanadaAudioVideoIE, RadioCanadaIE +from .radiode import RadioDeIE from .radiofrance import RadioFranceIE -from .rai import ( - RaiTVIE, - RaiIE, -) +from .radiojavan import RadioJavanIE +from .rai import RaiIE, RaiTVIE from .rbmaradio import RBMARadioIE from .rds import RDSIE from .redtube import RedTubeIE from .regiotv import RegioTVIE -from .rentv import ( - RENTVIE, - RENTVArticleIE, -) +from .rentv import RENTVIE, RENTVArticleIE from .restudy import RestudyIE from .reuters import ReutersIE from .reverbnation import ReverbNationIE -from .revision3 import ( - Revision3EmbedIE, - Revision3IE, -) +from .revision3 import Revision3EmbedIE, Revision3IE from .rice import RICEIE from .ringtv import RingTVIE from .rmcdecouverte import RMCDecouverteIE @@ -796,30 +568,26 @@ from .roxwel import RoxwelIE from .rozhlas import RozhlasIE from .rtbf import RTBFIE from .rte import RteIE, RteRadioIE -from .rtlnl import RtlNlIE from .rtl2 import RTL2IE +from .rtlnl import RtlNlIE from .rtp import RTPIE from .rts import RTSIE -from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE +from .rtve import RTVEALaCartaIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE from .rtvnh import RTVNHIE from .rudo import RudoIE from .ruhd import RUHDIE from .ruleporn import RulePornIE from .rutube import ( - RutubeIE, RutubeChannelIE, RutubeEmbedIE, + RutubeIE, RutubeMovieIE, RutubePersonIE, ) from .rutv import RUTVIE from .ruutu import RuutuIE +from .safari import SafariApiIE, SafariCourseIE, SafariIE from .sandia import SandiaIE -from .safari import ( - SafariIE, - SafariApiIE, - SafariCourseIE, -) from .sapo import SapoIE from .savefrom import SaveFromIE from .sbs import SBSIE @@ -832,90 +600,66 @@ from .sendtonews import SendtoNewsIE from .servingsys import ServingSysIE from .sexu import SexuIE from .shahid import ShahidIE -from .shared import ( - SharedIE, - VivoIE, -) +from .shared import SharedIE, VivoIE from .showroomlive import ShowRoomLiveIE from .sina import SinaIE from .sixplay import SixPlayIE -from .skynewsarabia import ( - SkyNewsArabiaIE, - SkyNewsArabiaArticleIE, -) +from .skynewsarabia import SkyNewsArabiaArticleIE, SkyNewsArabiaIE from .skysports import SkySportsIE from .slideshare import SlideshareIE from .slutload import SlutloadIE from .smotri import ( - SmotriIE, - SmotriCommunityIE, - SmotriUserIE, SmotriBroadcastIE, + SmotriCommunityIE, + SmotriIE, + SmotriUserIE, ) from .snotr import SnotrIE from .sohu import SohuIE from .sonyliv import SonyLIVIE from .soundcloud import ( SoundcloudIE, + SoundcloudPlaylistIE, + SoundcloudSearchIE, SoundcloudSetIE, SoundcloudUserIE, - SoundcloudPlaylistIE, - SoundcloudSearchIE -) -from .soundgasm import ( - SoundgasmIE, - SoundgasmProfileIE ) +from .soundgasm import SoundgasmIE, SoundgasmProfileIE from .southpark import ( - SouthParkIE, SouthParkDeIE, SouthParkDkIE, SouthParkEsIE, - SouthParkNlIE + SouthParkIE, + SouthParkNlIE, ) from .spankbang import SpankBangIE from .spankwire import SpankwireIE -from .spiegel import SpiegelIE, SpiegelArticleIE +from .spiegel import SpiegelArticleIE, SpiegelIE from .spiegeltv import SpiegeltvIE from .spike import SpikeIE -from .stitcher import StitcherIE from .sport5 import Sport5IE -from .sportbox import ( - SportBoxIE, - SportBoxEmbedIE, -) +from .sportbox import SportBoxEmbedIE, SportBoxIE from .sportdeutschland import SportDeutschlandIE from .sportschau import SportschauIE -from .srgssr import ( - SRGSSRIE, - SRGSSRPlayIE, -) +from .srgssr import SRGSSRIE, SRGSSRPlayIE from .srmediathek import SRMediathekIE from .stanfordoc import StanfordOpenClassroomIE from .steam import SteamIE +from .stitcher import StitcherIE from .streamable import StreamableIE from .streamcloud import StreamcloudIE from .streamcz import StreamCZIE from .streetvoice import StreetVoiceIE from .sunporno import SunPornoIE -from .svt import ( - SVTIE, - SVTPlayIE, -) +from .svt import SVTIE, SVTPlayIE from .swrmediathek import SWRMediathekIE from .syfy import SyfyIE from .sztvhu import SztvHuIE -from .tagesschau import ( - TagesschauPlayerIE, - TagesschauIE, -) +from .tagesschau import TagesschauIE, TagesschauPlayerIE from .tass import TassIE from .tbs import TBSIE from .tdslifeway import TDSLifewayIE -from .teachertube import ( - TeacherTubeIE, - TeacherTubeUserIE, -) +from .teachertube import TeacherTubeIE, TeacherTubeUserIE from .teachingchannel import TeachingChannelIE from .teamcoco import TeamcocoIE from .teamfourstar import TeamFourStarIE @@ -933,10 +677,7 @@ from .testurl import TestURLIE from .tf1 import TF1IE from .tfo import TFOIE from .theintercept import TheInterceptIE -from .theplatform import ( - ThePlatformIE, - ThePlatformFeedIE, -) +from .theplatform import ThePlatformFeedIE, ThePlatformIE from .thescene import TheSceneIE from .thesixtyone import TheSixtyOneIE from .thestar import TheStarIE @@ -947,133 +688,78 @@ from .thisoldhouse import ThisOldHouseIE from .threeqsdn import ThreeQSDNIE from .tinypic import TinyPicIE from .tlc import TlcDeIE -from .tmz import ( - TMZIE, - TMZArticleIE, -) -from .tnaflix import ( - TNAFlixNetworkEmbedIE, - TNAFlixIE, - EMPFlixIE, - MovieFapIE, -) +from .tmz import TMZIE, TMZArticleIE +from .tnaflix import EMPFlixIE, MovieFapIE, TNAFlixIE, TNAFlixNetworkEmbedIE from .toggle import ToggleIE from .tonline import TOnlineIE from .toutv import TouTvIE -from .toypics import ToypicsUserIE, ToypicsIE +from .toypics import ToypicsIE, ToypicsUserIE from .traileraddict import TrailerAddictIE from .trilulilu import TriluliluIE from .trutv import TruTVIE from .tube8 import Tube8IE from .tubitv import TubiTvIE -from .tudou import ( - TudouIE, - TudouPlaylistIE, - TudouAlbumIE, -) +from .tudou import TudouAlbumIE, TudouIE, TudouPlaylistIE from .tumblr import TumblrIE from .tunein import ( TuneInClipIE, - TuneInStationIE, TuneInProgramIE, - TuneInTopicIE, TuneInShortenerIE, + TuneInStationIE, + TuneInTopicIE, ) from .turbo import TurboIE from .tutv import TutvIE -from .tv2 import ( - TV2IE, - TV2ArticleIE, -) +from .tv2 import TV2IE, TV2ArticleIE from .tv3 import TV3IE from .tv4 import TV4IE from .tva import TVAIE -from .tvanouvelles import ( - TVANouvellesIE, - TVANouvellesArticleIE, -) -from .tvc import ( - TVCIE, - TVCArticleIE, -) +from .tvanouvelles import TVANouvellesArticleIE, TVANouvellesIE +from .tvc import TVCIE, TVCArticleIE from .tvigle import TvigleIE from .tvland import TVLandIE from .tvnoe import TVNoeIE -from .tvp import ( - TVPEmbedIE, - TVPIE, - TVPSeriesIE, -) -from .tvplay import ( - TVPlayIE, - ViafreeIE, -) +from .tvp import TVPIE, TVPEmbedIE, TVPSeriesIE +from .tvplay import TVPlayIE, ViafreeIE from .tweakers import TweakersIE from .twentyfourvideo import TwentyFourVideoIE from .twentymin import TwentyMinutenIE -from .twentytwotracks import ( - TwentyTwoTracksIE, - TwentyTwoTracksGenreIE -) +from .twentytwotracks import TwentyTwoTracksGenreIE, TwentyTwoTracksIE from .twitch import ( - TwitchVideoIE, - TwitchChapterIE, - TwitchVodIE, - TwitchProfileIE, TwitchAllVideosIE, - TwitchUploadsIE, - TwitchPastBroadcastsIE, - TwitchHighlightsIE, - TwitchStreamIE, + TwitchChapterIE, TwitchClipsIE, + TwitchHighlightsIE, + TwitchPastBroadcastsIE, + TwitchProfileIE, + TwitchStreamIE, + TwitchUploadsIE, + TwitchVideoIE, + TwitchVodIE, ) -from .twitter import ( - TwitterCardIE, - TwitterIE, - TwitterAmplifyIE, -) -from .udemy import ( - UdemyIE, - UdemyCourseIE -) +from .twitter import TwitterAmplifyIE, TwitterCardIE, TwitterIE +from .udemy import UdemyCourseIE, UdemyIE from .udn import UDNEmbedIE from .uktvplay import UKTVPlayIE -from .digiteka import DigitekaIE from .unistra import UnistraIE from .uol import UOLIE -from .uplynk import ( - UplynkIE, - UplynkPreplayIE, -) +from .uplynk import UplynkIE, UplynkPreplayIE from .urort import UrortIE from .urplay import URPlayIE from .usanetwork import USANetworkIE from .usatoday import USATodayIE -from .ustream import UstreamIE, UstreamChannelIE -from .ustudio import ( - UstudioIE, - UstudioEmbedIE, -) +from .ustream import UstreamChannelIE, UstreamIE +from .ustudio import UstudioEmbedIE, UstudioIE 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, - VevoPlaylistIE, -) -from .vgtv import ( - BTArticleIE, - BTVestlendingenIE, - VGTVIE, -) +from .vevo import VevoIE, VevoPlaylistIE +from .vgtv import VGTVIE, BTArticleIE, BTVestlendingenIE from .vh1 import VH1IE -from .vice import ( - ViceIE, - ViceShowIE, -) +from .vice import ViceIE, ViceShowIE from .viceland import VicelandIE from .vidbit import VidbitIE from .viddler import ViddlerIE @@ -1081,31 +767,21 @@ from .videa import VideaIE from .videodetective import VideoDetectiveIE from .videofyme import VideofyMeIE from .videomega import VideoMegaIE -from .videomore import ( - VideomoreIE, - VideomoreVideoIE, - VideomoreSeasonIE, -) +from .videomore import VideomoreIE, VideomoreSeasonIE, VideomoreVideoIE from .videopremium import VideoPremiumIE from .vidio import VidioIE -from .vidme import ( - VidmeIE, - VidmeUserIE, - VidmeUserLikesIE, -) +from .vidme import VidmeIE, VidmeUserIE, VidmeUserLikesIE from .vidzi import VidziIE from .vier import VierIE, VierVideosIE -from .viewlift import ( - ViewLiftIE, - ViewLiftEmbedIE, -) +from .viewlift import ViewLiftEmbedIE, ViewLiftIE from .viewster import ViewsterIE from .viidea import ViideaIE +from .viki import VikiChannelIE, VikiIE from .vimeo import ( - VimeoIE, VimeoAlbumIE, VimeoChannelIE, VimeoGroupsIE, + VimeoIE, VimeoLikesIE, VimeoOndemandIE, VimeoReviewIE, @@ -1113,28 +789,10 @@ from .vimeo import ( VimeoWatchLaterIE, ) from .vimple import VimpleIE -from .vine import ( - VineIE, - VineUserIE, -) -from .viki import ( - VikiIE, - VikiChannelIE, -) -from .viu import ( - ViuIE, - ViuPlaylistIE, - ViuOTTIE, -) -from .vk import ( - VKIE, - VKUserVideosIE, - VKWallPostIE, -) -from .vlive import ( - VLiveIE, - VLiveChannelIE -) +from .vine import VineIE, VineUserIE +from .viu import ViuIE, ViuOTTIE, ViuPlaylistIE +from .vk import VKIE, VKUserVideosIE, VKWallPostIE +from .vlive import VLiveChannelIE, VLiveIE from .vodlocker import VodlockerIE from .vodplatform import VODPlatformIE from .voicerepublic import VoiceRepublicIE @@ -1147,78 +805,49 @@ from .vvvvid import VVVVIDIE from .vyborymos import VyboryMosIE from .vzaar import VzaarIE from .walla import WallaIE -from .washingtonpost import ( - WashingtonPostIE, - WashingtonPostArticleIE, -) +from .washingtonpost import WashingtonPostArticleIE, WashingtonPostIE from .wat import WatIE from .watchindianporn import WatchIndianPornIE -from .wdr import ( - WDRIE, - WDRMobileIE, -) -from .webcaster import ( - WebcasterIE, - WebcasterFeedIE, -) -from .webofstories import ( - WebOfStoriesIE, - WebOfStoriesPlaylistIE, -) +from .wdr import WDRIE, WDRMobileIE +from .webcaster import WebcasterFeedIE, WebcasterIE +from .webofstories import WebOfStoriesIE, WebOfStoriesPlaylistIE from .weiqitv import WeiqiTVIE from .wimp import WimpIE from .wistia import WistiaIE from .worldstarhiphop import WorldStarHipHopIE -from .wrzuta import ( - WrzutaIE, - WrzutaPlaylistIE, -) +from .wrzuta import WrzutaIE, WrzutaPlaylistIE from .wsj import WSJIE from .xbef import XBefIE from .xboxclips import XboxClipsIE from .xfileshare import XFileShareIE -from .xhamster import ( - XHamsterIE, - XHamsterEmbedIE, -) -from .xiami import ( - XiamiSongIE, - XiamiAlbumIE, - XiamiArtistIE, - XiamiCollectionIE -) +from .xhamster import XHamsterEmbedIE, XHamsterIE +from .xiami import XiamiAlbumIE, XiamiArtistIE, XiamiCollectionIE, XiamiSongIE from .xminus import XMinusIE from .xnxx import XNXXIE from .xstream import XstreamIE -from .xtube import XTubeUserIE, XTubeIE +from .xtube import XTubeIE, XTubeUserIE from .xuite import XuiteIE from .xvideos import XVideosIE from .xxxymovies import XXXYMoviesIE -from .yahoo import ( - YahooIE, - YahooSearchIE, -) +from .yahoo import YahooIE, YahooSearchIE from .yam import YamIE from .yandexmusic import ( - YandexMusicTrackIE, YandexMusicAlbumIE, YandexMusicPlaylistIE, + YandexMusicTrackIE, ) from .yesjapan import YesJapanIE from .yinyuetai import YinYueTaiIE from .ynet import YnetIE from .youjizz import YouJizzIE -from .youku import ( - YoukuIE, - YoukuShowIE, -) +from .youku import YoukuIE, YoukuShowIE from .youporn import YouPornIE from .yourupload import YourUploadIE from .youtube import ( - YoutubeIE, YoutubeChannelIE, YoutubeFavouritesIE, YoutubeHistoryIE, + YoutubeIE, YoutubeLiveIE, YoutubePlaylistIE, YoutubePlaylistsIE, diff --git a/youtube_dl/extractor/eyedotv.py b/youtube_dl/extractor/eyedotv.py index 2f3035147..b36450ce5 100644 --- a/youtube_dl/extractor/eyedotv.py +++ b/youtube_dl/extractor/eyedotv.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, parse_duration, xpath_text from .common import InfoExtractor -from ..utils import ( - xpath_text, - parse_duration, - ExtractorError, -) class EyedoTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index c0a7fc7d8..f60efe27a 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re import socket -from .common import InfoExtractor from ..compat import ( compat_etree_fromstring, compat_http_client, @@ -12,15 +11,16 @@ from ..compat import ( compat_urllib_parse_unquote_plus, ) from ..utils import ( - error_to_compat_str, ExtractorError, + clean_html, + error_to_compat_str, + get_element_by_id, int_or_none, limit_length, sanitized_Request, urlencode_postdata, - get_element_by_id, - clean_html, ) +from .common import InfoExtractor class FacebookIE(InfoExtractor): diff --git a/youtube_dl/extractor/faz.py b/youtube_dl/extractor/faz.py index 4bc8fc512..578b47c60 100644 --- a/youtube_dl/extractor/faz.py +++ b/youtube_dl/extractor/faz.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, xpath_element, xpath_text from .common import InfoExtractor -from ..utils import ( - xpath_element, - xpath_text, - int_or_none, -) class FazIE(InfoExtractor): diff --git a/youtube_dl/extractor/fc2.py b/youtube_dl/extractor/fc2.py index 448647d72..f8c2be292 100644 --- a/youtube_dl/extractor/fc2.py +++ b/youtube_dl/extractor/fc2.py @@ -4,17 +4,9 @@ from __future__ import unicode_literals import hashlib import re +from ..compat import compat_parse_qs, compat_urllib_request, compat_urlparse +from ..utils import ExtractorError, sanitized_Request, urlencode_postdata from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_request, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - sanitized_Request, - urlencode_postdata, -) class FC2IE(InfoExtractor): diff --git a/youtube_dl/extractor/fczenit.py b/youtube_dl/extractor/fczenit.py index 8d1010b88..2825e246a 100644 --- a/youtube_dl/extractor/fczenit.py +++ b/youtube_dl/extractor/fczenit.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse +from .common import InfoExtractor class FczenitIE(InfoExtractor): diff --git a/youtube_dl/extractor/firsttv.py b/youtube_dl/extractor/firsttv.py index 081c71842..7ad62a10d 100644 --- a/youtube_dl/extractor/firsttv.py +++ b/youtube_dl/extractor/firsttv.py @@ -1,16 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_str, compat_urlparse +from ..utils import int_or_none, qualities, unified_strdate from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) -from ..utils import ( - int_or_none, - qualities, - unified_strdate, -) class FirstTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/fivetv.py b/youtube_dl/extractor/fivetv.py index 15736c9fe..b4cbe36a6 100644 --- a/youtube_dl/extractor/fivetv.py +++ b/youtube_dl/extractor/fivetv.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class FiveTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/fktv.py b/youtube_dl/extractor/fktv.py index 2958452f4..f7b033f10 100644 --- a/youtube_dl/extractor/fktv.py +++ b/youtube_dl/extractor/fktv.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals +from ..utils import clean_html, determine_ext, js_to_json from .common import InfoExtractor -from ..utils import ( - clean_html, - determine_ext, - js_to_json, -) class FKTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py index a8e1bf42a..cdf5557bd 100644 --- a/youtube_dl/extractor/flickr.py +++ b/youtube_dl/extractor/flickr.py @@ -1,12 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlencode -from ..utils import ( - ExtractorError, - int_or_none, - qualities, -) +from ..utils import ExtractorError, int_or_none, qualities +from .common import InfoExtractor class FlickrIE(InfoExtractor): diff --git a/youtube_dl/extractor/flipagram.py b/youtube_dl/extractor/flipagram.py index b7be40f1b..461d23adc 100644 --- a/youtube_dl/extractor/flipagram.py +++ b/youtube_dl/extractor/flipagram.py @@ -1,14 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - float_or_none, - try_get, - unified_timestamp, -) +from ..utils import float_or_none, int_or_none, try_get, unified_timestamp +from .common import InfoExtractor class FlipagramIE(InfoExtractor): diff --git a/youtube_dl/extractor/folketinget.py b/youtube_dl/extractor/folketinget.py index b3df93f28..99aa7eaf0 100644 --- a/youtube_dl/extractor/folketinget.py +++ b/youtube_dl/extractor/folketinget.py @@ -1,14 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_parse_qs -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, - xpath_text, -) +from ..utils import int_or_none, parse_duration, parse_iso8601, xpath_text +from .common import InfoExtractor class FolketingetIE(InfoExtractor): diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dl/extractor/fourtube.py index 9776c8422..0cda368ce 100644 --- a/youtube_dl/extractor/fourtube.py +++ b/youtube_dl/extractor/fourtube.py @@ -2,13 +2,13 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( parse_duration, parse_iso8601, sanitized_Request, str_to_int, ) +from .common import InfoExtractor class FourTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/fox.py b/youtube_dl/extractor/fox.py index 9f2e5d065..ca2d3e212 100644 --- a/youtube_dl/extractor/fox.py +++ b/youtube_dl/extractor/fox.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import smuggle_url, update_url_query from .adobepass import AdobePassIE -from ..utils import ( - smuggle_url, - update_url_query, -) class FOXIE(AdobePassIE): diff --git a/youtube_dl/extractor/fox9.py b/youtube_dl/extractor/fox9.py index 56d9975d0..eeb21449d 100644 --- a/youtube_dl/extractor/fox9.py +++ b/youtube_dl/extractor/fox9.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .anvato import AnvatoIE from ..utils import js_to_json +from .anvato import AnvatoIE class FOX9IE(AnvatoIE): diff --git a/youtube_dl/extractor/foxgay.py b/youtube_dl/extractor/foxgay.py index e887ae488..7d6b11779 100644 --- a/youtube_dl/extractor/foxgay.py +++ b/youtube_dl/extractor/foxgay.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import itertools +from ..utils import get_element_by_id, remove_end from .common import InfoExtractor -from ..utils import ( - get_element_by_id, - remove_end, -) class FoxgayIE(InfoExtractor): diff --git a/youtube_dl/extractor/foxsports.py b/youtube_dl/extractor/foxsports.py index a3bb98377..351dbb148 100644 --- a/youtube_dl/extractor/foxsports.py +++ b/youtube_dl/extractor/foxsports.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import smuggle_url, update_url_query from .common import InfoExtractor -from ..utils import ( - smuggle_url, - update_url_query, -) class FoxSportsIE(InfoExtractor): diff --git a/youtube_dl/extractor/franceculture.py b/youtube_dl/extractor/franceculture.py index b98da692c..8cc1ccf59 100644 --- a/youtube_dl/extractor/franceculture.py +++ b/youtube_dl/extractor/franceculture.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, unified_strdate from .common import InfoExtractor -from ..utils import ( - determine_ext, - unified_strdate, -) class FranceCultureIE(InfoExtractor): diff --git a/youtube_dl/extractor/franceinter.py b/youtube_dl/extractor/franceinter.py index 707b9e00d..30a82e960 100644 --- a/youtube_dl/extractor/franceinter.py +++ b/youtube_dl/extractor/franceinter.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import month_by_name +from .common import InfoExtractor class FranceInterIE(InfoExtractor): diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index 48d43ae58..b383da749 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -2,22 +2,19 @@ from __future__ import unicode_literals -import re import json +import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - clean_html, ExtractorError, + clean_html, + determine_ext, int_or_none, parse_duration, - determine_ext, -) -from .dailymotion import ( - DailymotionIE, - DailymotionCloudIE, ) +from .common import InfoExtractor +from .dailymotion import DailymotionCloudIE, DailymotionIE class FranceTVBaseInfoExtractor(InfoExtractor): diff --git a/youtube_dl/extractor/freesound.py b/youtube_dl/extractor/freesound.py index 138b6bc58..fd01e9b6e 100644 --- a/youtube_dl/extractor/freesound.py +++ b/youtube_dl/extractor/freesound.py @@ -2,13 +2,13 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( float_or_none, get_element_by_class, get_element_by_id, unified_strdate, ) +from .common import InfoExtractor class FreesoundIE(InfoExtractor): diff --git a/youtube_dl/extractor/freespeech.py b/youtube_dl/extractor/freespeech.py index 0a70ca763..34753e893 100644 --- a/youtube_dl/extractor/freespeech.py +++ b/youtube_dl/extractor/freespeech.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -import re import json +import re from .common import InfoExtractor diff --git a/youtube_dl/extractor/funimation.py b/youtube_dl/extractor/funimation.py index eba00cd5a..3aab52230 100644 --- a/youtube_dl/extractor/funimation.py +++ b/youtube_dl/extractor/funimation.py @@ -1,19 +1,16 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_urllib_parse_unquote_plus, -) +from ..compat import compat_HTTPError, compat_urllib_parse_unquote_plus from ..utils import ( + ExtractorError, clean_html, determine_ext, int_or_none, sanitized_Request, - ExtractorError, - urlencode_postdata + urlencode_postdata, ) +from .common import InfoExtractor class FunimationIE(InfoExtractor): diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 81c0ce9a3..fdb1768aa 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class FunnyOrDieIE(InfoExtractor): diff --git a/youtube_dl/extractor/fxnetworks.py b/youtube_dl/extractor/fxnetworks.py index 629897317..a73d3296c 100644 --- a/youtube_dl/extractor/fxnetworks.py +++ b/youtube_dl/extractor/fxnetworks.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from .adobepass import AdobePassIE from ..utils import ( - update_url_query, extract_attributes, parse_age_limit, smuggle_url, + update_url_query, ) +from .adobepass import AdobePassIE class FXNetworksIE(AdobePassIE): diff --git a/youtube_dl/extractor/gameone.py b/youtube_dl/extractor/gameone.py index a07d69841..bc1bc9776 100644 --- a/youtube_dl/extractor/gameone.py +++ b/youtube_dl/extractor/gameone.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import float_or_none, int_or_none, parse_iso8601, xpath_with_ns from .common import InfoExtractor -from ..utils import ( - xpath_with_ns, - parse_iso8601, - float_or_none, - int_or_none, -) NAMESPACE_MAP = { 'media': 'http://search.yahoo.com/mrss/', diff --git a/youtube_dl/extractor/gamersyde.py b/youtube_dl/extractor/gamersyde.py index a218a6944..4a8e408f3 100644 --- a/youtube_dl/extractor/gamersyde.py +++ b/youtube_dl/extractor/gamersyde.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import js_to_json, parse_duration, remove_start from .common import InfoExtractor -from ..utils import ( - js_to_json, - parse_duration, - remove_start, -) class GamersydeIE(InfoExtractor): diff --git a/youtube_dl/extractor/gamespot.py b/youtube_dl/extractor/gamespot.py index 682c49e79..adcc06e5a 100644 --- a/youtube_dl/extractor/gamespot.py +++ b/youtube_dl/extractor/gamespot.py @@ -2,15 +2,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_urllib_parse_unquote +from ..utils import dict_get, unescapeHTML, url_basename from .once import OnceIE -from ..compat import ( - compat_urllib_parse_unquote, -) -from ..utils import ( - unescapeHTML, - url_basename, - dict_get, -) class GameSpotIE(OnceIE): diff --git a/youtube_dl/extractor/gamestar.py b/youtube_dl/extractor/gamestar.py index e607d6ab8..c0ac2aac3 100644 --- a/youtube_dl/extractor/gamestar.py +++ b/youtube_dl/extractor/gamestar.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, remove_end from .common import InfoExtractor -from ..utils import ( - int_or_none, - remove_end, -) class GameStarIE(InfoExtractor): diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py index 3136427db..c2784ab20 100644 --- a/youtube_dl/extractor/gdcvault.py +++ b/youtube_dl/extractor/gdcvault.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import HEADRequest, sanitized_Request, urlencode_postdata from .common import InfoExtractor -from ..utils import ( - HEADRequest, - sanitized_Request, - urlencode_postdata, -) class GDCVaultIE(InfoExtractor): diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index a23486620..6db182acb 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -6,8 +6,6 @@ import os import re import sys -from .common import InfoExtractor -from .youtube import YoutubeIE from ..compat import ( compat_etree_fromstring, compat_urllib_parse_unquote, @@ -15,10 +13,11 @@ from ..compat import ( compat_xml_parse_error, ) from ..utils import ( - determine_ext, ExtractorError, - float_or_none, HEADRequest, + UnsupportedError, + determine_ext, + float_or_none, is_html, orderedSet, sanitized_Request, @@ -26,61 +25,56 @@ from ..utils import ( unescapeHTML, unified_strdate, unsmuggle_url, - UnsupportedError, xpath_text, ) -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, -) -from .nbc import NBCSportsVPlayerIE -from .ooyala import OoyalaIE -from .rutv import RUTVIE -from .tvc import TVCIE -from .sportbox import SportBoxEmbedIE -from .smotri import SmotriIE -from .myvi import MyviIE -from .condenast import CondeNastIE -from .udn import UDNEmbedIE -from .senateisvp import SenateISVPIE -from .svt import SVTIE -from .pornhub import PornHubIE -from .xhamster import XHamsterEmbedIE -from .tnaflix import TNAFlixNetworkEmbedIE -from .drtuber import DrTuberIE -from .redtube import RedTubeIE -from .vimeo import VimeoIE -from .dailymotion import ( - DailymotionIE, - DailymotionCloudIE, -) -from .onionstudios import OnionStudiosIE -from .viewlift import ViewLiftEmbedIE -from .mtv import MTVServicesEmbeddedIE -from .pladform import PladformIE -from .videomore import VideomoreIE -from .webcaster import WebcasterFeedIE -from .googledrive import GoogleDriveIE -from .jwplatform import JWPlatformIE -from .digiteka import DigitekaIE from .arkena import ArkenaIE -from .instagram import InstagramIE -from .liveleak import LiveLeakIE -from .threeqsdn import ThreeQSDNIE -from .theplatform import ThePlatformIE -from .vessel import VesselIE -from .kaltura import KalturaIE +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE +from .common import InfoExtractor +from .condenast import CondeNastIE +from .dailymotion import DailymotionCloudIE, DailymotionIE +from .dbtv import DBTVIE +from .digiteka import DigitekaIE +from .drtuber import DrTuberIE from .eagleplatform import EaglePlatformIE from .facebook import FacebookIE -from .soundcloud import SoundcloudIE -from .tunein import TuneInBaseIE -from .vbox7 import Vbox7IE -from .dbtv import DBTVIE -from .piksel import PikselIE -from .videa import VideaIE -from .twentymin import TwentyMinutenIE -from .ustream import UstreamIE +from .googledrive import GoogleDriveIE +from .instagram import InstagramIE +from .jwplatform import JWPlatformIE +from .kaltura import KalturaIE +from .liveleak import LiveLeakIE +from .mtv import MTVServicesEmbeddedIE +from .myvi import MyviIE +from .nbc import NBCSportsVPlayerIE +from .onionstudios import OnionStudiosIE +from .ooyala import OoyalaIE from .openload import OpenloadIE +from .piksel import PikselIE +from .pladform import PladformIE +from .pornhub import PornHubIE +from .redtube import RedTubeIE +from .rutv import RUTVIE +from .senateisvp import SenateISVPIE +from .smotri import SmotriIE +from .soundcloud import SoundcloudIE +from .sportbox import SportBoxEmbedIE +from .svt import SVTIE +from .theplatform import ThePlatformIE +from .threeqsdn import ThreeQSDNIE +from .tnaflix import TNAFlixNetworkEmbedIE +from .tunein import TuneInBaseIE +from .tvc import TVCIE +from .twentymin import TwentyMinutenIE +from .udn import UDNEmbedIE +from .ustream import UstreamIE +from .vbox7 import Vbox7IE +from .vessel import VesselIE +from .videa import VideaIE +from .videomore import VideomoreIE +from .viewlift import ViewLiftEmbedIE +from .vimeo import VimeoIE +from .webcaster import WebcasterFeedIE +from .xhamster import XHamsterEmbedIE +from .youtube import YoutubeIE class GenericIE(InfoExtractor): diff --git a/youtube_dl/extractor/gfycat.py b/youtube_dl/extractor/gfycat.py index 884700c52..e151d48e8 100644 --- a/youtube_dl/extractor/gfycat.py +++ b/youtube_dl/extractor/gfycat.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, float_or_none, int_or_none, qualities from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - qualities, - ExtractorError, -) class GfycatIE(InfoExtractor): diff --git a/youtube_dl/extractor/giantbomb.py b/youtube_dl/extractor/giantbomb.py index 29b684d35..4cb554ec6 100644 --- a/youtube_dl/extractor/giantbomb.py +++ b/youtube_dl/extractor/giantbomb.py @@ -1,14 +1,10 @@ from __future__ import unicode_literals -import re import json +import re +from ..utils import int_or_none, qualities, unescapeHTML from .common import InfoExtractor -from ..utils import ( - unescapeHTML, - qualities, - int_or_none, -) class GiantBombIE(InfoExtractor): diff --git a/youtube_dl/extractor/giga.py b/youtube_dl/extractor/giga.py index 5a9992a27..6df6f32c5 100644 --- a/youtube_dl/extractor/giga.py +++ b/youtube_dl/extractor/giga.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals import itertools -from .common import InfoExtractor from ..utils import ( - qualities, compat_str, parse_duration, parse_iso8601, + qualities, str_to_int, ) +from .common import InfoExtractor class GigaIE(InfoExtractor): diff --git a/youtube_dl/extractor/globo.py b/youtube_dl/extractor/globo.py index dc7b2661c..f4b2e82a9 100644 --- a/youtube_dl/extractor/globo.py +++ b/youtube_dl/extractor/globo.py @@ -1,16 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals +import math import random import re -import math -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_chr, - compat_ord, -) +from ..compat import compat_chr, compat_ord, compat_str from ..utils import ( ExtractorError, float_or_none, @@ -18,6 +13,7 @@ from ..utils import ( orderedSet, str_or_none, ) +from .common import InfoExtractor class GloboIE(InfoExtractor): diff --git a/youtube_dl/extractor/go.py b/youtube_dl/extractor/go.py index c7776b186..391f11a47 100644 --- a/youtube_dl/extractor/go.py +++ b/youtube_dl/extractor/go.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - int_or_none, + ExtractorError, determine_ext, + int_or_none, parse_age_limit, urlencode_postdata, - ExtractorError, ) +from .common import InfoExtractor class GoIE(InfoExtractor): diff --git a/youtube_dl/extractor/godtube.py b/youtube_dl/extractor/godtube.py index 92efd16b3..70d8ef970 100644 --- a/youtube_dl/extractor/godtube.py +++ b/youtube_dl/extractor/godtube.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_duration, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, -) class GodTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/godtv.py b/youtube_dl/extractor/godtv.py index c5d3b4e6a..e9bcfae74 100644 --- a/youtube_dl/extractor/godtv.py +++ b/youtube_dl/extractor/godtv.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals +from ..utils import js_to_json from .common import InfoExtractor from .ooyala import OoyalaIE -from ..utils import js_to_json class GodTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/golem.py b/youtube_dl/extractor/golem.py index 2bfb99040..93ef67895 100644 --- a/youtube_dl/extractor/golem.py +++ b/youtube_dl/extractor/golem.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_urlparse +from ..utils import determine_ext from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) -from ..utils import ( - determine_ext, -) class GolemIE(InfoExtractor): diff --git a/youtube_dl/extractor/googledrive.py b/youtube_dl/extractor/googledrive.py index 766fc26d0..c20c6a810 100644 --- a/youtube_dl/extractor/googledrive.py +++ b/youtube_dl/extractor/googledrive.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, -) class GoogleDriveIE(InfoExtractor): diff --git a/youtube_dl/extractor/googleplus.py b/youtube_dl/extractor/googleplus.py index 427499b11..f9df8b6f9 100644 --- a/youtube_dl/extractor/googleplus.py +++ b/youtube_dl/extractor/googleplus.py @@ -1,11 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import codecs +import re -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class GooglePlusIE(InfoExtractor): diff --git a/youtube_dl/extractor/goshgay.py b/youtube_dl/extractor/goshgay.py index 377981d3e..cbe29eb28 100644 --- a/youtube_dl/extractor/goshgay.py +++ b/youtube_dl/extractor/goshgay.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_parse_qs +from ..utils import parse_duration from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, -) -from ..utils import ( - parse_duration, -) class GoshgayIE(InfoExtractor): diff --git a/youtube_dl/extractor/hbo.py b/youtube_dl/extractor/hbo.py index 8116ad9bd..8ba13b723 100644 --- a/youtube_dl/extractor/hbo.py +++ b/youtube_dl/extractor/hbo.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration, xpath_element, xpath_text from .common import InfoExtractor -from ..utils import ( - xpath_text, - xpath_element, - int_or_none, - parse_duration, -) class HBOBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/hearthisat.py b/youtube_dl/extractor/hearthisat.py index 18c252012..ca6d4ae40 100644 --- a/youtube_dl/extractor/hearthisat.py +++ b/youtube_dl/extractor/hearthisat.py @@ -3,16 +3,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - HEADRequest, KNOWN_EXTENSIONS, + HEADRequest, sanitized_Request, str_to_int, urlencode_postdata, urlhandle_detect_ext, ) +from .common import InfoExtractor class HearThisAtIE(InfoExtractor): diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py index 1629cdb8d..7acd0a80f 100644 --- a/youtube_dl/extractor/heise.py +++ b/youtube_dl/extractor/heise.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - parse_iso8601, -) class HeiseIE(InfoExtractor): diff --git a/youtube_dl/extractor/hellporno.py b/youtube_dl/extractor/hellporno.py index 0ee8ea712..ed73d9a78 100644 --- a/youtube_dl/extractor/hellporno.py +++ b/youtube_dl/extractor/hellporno.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, js_to_json, remove_end from .common import InfoExtractor -from ..utils import ( - js_to_json, - remove_end, - determine_ext, -) class HellPornoIE(InfoExtractor): diff --git a/youtube_dl/extractor/helsinki.py b/youtube_dl/extractor/helsinki.py index 575fb332a..8e72b8eb5 100644 --- a/youtube_dl/extractor/helsinki.py +++ b/youtube_dl/extractor/helsinki.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import js_to_json +from .common import InfoExtractor class HelsinkiIE(InfoExtractor): diff --git a/youtube_dl/extractor/hgtv.py b/youtube_dl/extractor/hgtv.py index 69543bff2..9db63737c 100644 --- a/youtube_dl/extractor/hgtv.py +++ b/youtube_dl/extractor/hgtv.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, js_to_json, smuggle_url from .common import InfoExtractor -from ..utils import ( - int_or_none, - js_to_json, - smuggle_url, -) class HGTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/historicfilms.py b/youtube_dl/extractor/historicfilms.py index 56343e98f..3a14aa728 100644 --- a/youtube_dl/extractor/historicfilms.py +++ b/youtube_dl/extractor/historicfilms.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import parse_duration +from .common import InfoExtractor class HistoricFilmsIE(InfoExtractor): diff --git a/youtube_dl/extractor/hitbox.py b/youtube_dl/extractor/hitbox.py index e21ebb8fb..32b073167 100644 --- a/youtube_dl/extractor/hitbox.py +++ b/youtube_dl/extractor/hitbox.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( clean_html, - parse_iso8601, - float_or_none, - int_or_none, compat_str, determine_ext, + float_or_none, + int_or_none, + parse_iso8601, ) +from .common import InfoExtractor class HitboxIE(InfoExtractor): diff --git a/youtube_dl/extractor/hitrecord.py b/youtube_dl/extractor/hitrecord.py index 01a6946d0..35284afae 100644 --- a/youtube_dl/extractor/hitrecord.py +++ b/youtube_dl/extractor/hitrecord.py @@ -1,13 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - clean_html, - float_or_none, - int_or_none, - try_get, -) +from ..utils import clean_html, float_or_none, int_or_none, try_get +from .common import InfoExtractor class HitRecordIE(InfoExtractor): diff --git a/youtube_dl/extractor/hornbunny.py b/youtube_dl/extractor/hornbunny.py index c458a959d..8692233d3 100644 --- a/youtube_dl/extractor/hornbunny.py +++ b/youtube_dl/extractor/hornbunny.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, -) class HornBunnyIE(InfoExtractor): diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py index 34163725f..653a9a4fb 100644 --- a/youtube_dl/extractor/hotnewhiphop.py +++ b/youtube_dl/extractor/hotnewhiphop.py @@ -2,13 +2,13 @@ from __future__ import unicode_literals import base64 -from .common import InfoExtractor from ..utils import ( ExtractorError, HEADRequest, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class HotNewHipHopIE(InfoExtractor): diff --git a/youtube_dl/extractor/hotstar.py b/youtube_dl/extractor/hotstar.py index f05d765d6..bfa8f5cc3 100644 --- a/youtube_dl/extractor/hotstar.py +++ b/youtube_dl/extractor/hotstar.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, determine_ext, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - determine_ext, - int_or_none, -) class HotStarIE(InfoExtractor): diff --git a/youtube_dl/extractor/howcast.py b/youtube_dl/extractor/howcast.py index 7e36b85ad..a3a71436f 100644 --- a/youtube_dl/extractor/howcast.py +++ b/youtube_dl/extractor/howcast.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import parse_iso8601 +from .common import InfoExtractor class HowcastIE(InfoExtractor): diff --git a/youtube_dl/extractor/howstuffworks.py b/youtube_dl/extractor/howstuffworks.py index 2be68abad..3e3edf873 100644 --- a/youtube_dl/extractor/howstuffworks.py +++ b/youtube_dl/extractor/howstuffworks.py @@ -1,13 +1,13 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( + determine_ext, find_xpath_attr, int_or_none, js_to_json, unescapeHTML, - determine_ext, ) +from .common import InfoExtractor class HowStuffWorksIE(InfoExtractor): diff --git a/youtube_dl/extractor/hrti.py b/youtube_dl/extractor/hrti.py index 656ce6d05..2d63aa236 100644 --- a/youtube_dl/extractor/hrti.py +++ b/youtube_dl/extractor/hrti.py @@ -4,16 +4,16 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, parse_age_limit, sanitized_Request, try_get, ) +from .common import InfoExtractor class HRTiBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/huajiao.py b/youtube_dl/extractor/huajiao.py index 4ca275dda..e4006fc67 100644 --- a/youtube_dl/extractor/huajiao.py +++ b/youtube_dl/extractor/huajiao.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import parse_duration, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, -) class HuajiaoIE(InfoExtractor): diff --git a/youtube_dl/extractor/huffpost.py b/youtube_dl/extractor/huffpost.py index 97e36f056..fa452d3c5 100644 --- a/youtube_dl/extractor/huffpost.py +++ b/youtube_dl/extractor/huffpost.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, parse_duration, unified_strdate from .common import InfoExtractor -from ..utils import ( - determine_ext, - parse_duration, - unified_strdate, -) class HuffPostIE(InfoExtractor): diff --git a/youtube_dl/extractor/hypem.py b/youtube_dl/extractor/hypem.py index f7c913054..7c4ea0689 100644 --- a/youtube_dl/extractor/hypem.py +++ b/youtube_dl/extractor/hypem.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import json import time -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlencode -from ..utils import ( - ExtractorError, - sanitized_Request, -) +from ..utils import ExtractorError, sanitized_Request +from .common import InfoExtractor class HypemIE(InfoExtractor): diff --git a/youtube_dl/extractor/iconosquare.py b/youtube_dl/extractor/iconosquare.py index a39f422e9..8a4f84517 100644 --- a/youtube_dl/extractor/iconosquare.py +++ b/youtube_dl/extractor/iconosquare.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals +from ..utils import get_element_by_id, int_or_none, remove_end from .common import InfoExtractor -from ..utils import ( - int_or_none, - get_element_by_id, - remove_end, -) class IconosquareIE(InfoExtractor): diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py index c45c68c1d..7f794ae51 100644 --- a/youtube_dl/extractor/ign.py +++ b/youtube_dl/extractor/ign.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class IGNIE(InfoExtractor): diff --git a/youtube_dl/extractor/imdb.py b/youtube_dl/extractor/imdb.py index f95c00c73..1e5fb0a57 100644 --- a/youtube_dl/extractor/imdb.py +++ b/youtube_dl/extractor/imdb.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import mimetype2ext, qualities, remove_end from .common import InfoExtractor -from ..utils import ( - mimetype2ext, - qualities, - remove_end, -) class ImdbIE(InfoExtractor): diff --git a/youtube_dl/extractor/imgur.py b/youtube_dl/extractor/imgur.py index 67c24a51c..89857e730 100644 --- a/youtube_dl/extractor/imgur.py +++ b/youtube_dl/extractor/imgur.py @@ -2,14 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - mimetype2ext, - ExtractorError, -) +from ..utils import ExtractorError, int_or_none, js_to_json, mimetype2ext +from .common import InfoExtractor class ImgurIE(InfoExtractor): diff --git a/youtube_dl/extractor/indavideo.py b/youtube_dl/extractor/indavideo.py index 11cf3c609..1c59fa27f 100644 --- a/youtube_dl/extractor/indavideo.py +++ b/youtube_dl/extractor/indavideo.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_age_limit, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_age_limit, - parse_iso8601, -) class IndavideoEmbedIE(InfoExtractor): diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py index 98f408c18..173d0830f 100644 --- a/youtube_dl/extractor/instagram.py +++ b/youtube_dl/extractor/instagram.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( get_element_by_attribute, int_or_none, @@ -10,6 +9,7 @@ from ..utils import ( lowercase_escape, try_get, ) +from .common import InfoExtractor class InstagramIE(InfoExtractor): diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py index 76cc5ec3e..ccdc59cd5 100644 --- a/youtube_dl/extractor/internetvideoarchive.py +++ b/youtube_dl/extractor/internetvideoarchive.py @@ -1,15 +1,8 @@ from __future__ import unicode_literals +from ..compat import compat_parse_qs, compat_urlparse +from ..utils import determine_ext, int_or_none, xpath_text from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) -from ..utils import ( - determine_ext, - int_or_none, - xpath_text, -) class InternetVideoArchiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/iprima.py b/youtube_dl/extractor/iprima.py index da2cdc656..42cdcb796 100644 --- a/youtube_dl/extractor/iprima.py +++ b/youtube_dl/extractor/iprima.py @@ -4,12 +4,8 @@ from __future__ import unicode_literals import re import time +from ..utils import determine_ext, js_to_json, sanitized_Request from .common import InfoExtractor -from ..utils import ( - determine_ext, - js_to_json, - sanitized_Request, -) class IPrimaIE(InfoExtractor): diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py index 01c7b3042..b92067071 100644 --- a/youtube_dl/extractor/iqiyi.py +++ b/youtube_dl/extractor/iqiyi.py @@ -6,20 +6,17 @@ import itertools import re import time -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ( + ExtractorError, clean_html, decode_packed_codes, - get_element_by_id, get_element_by_attribute, - ExtractorError, + get_element_by_id, ohdave_rsa_encrypt, remove_start, ) +from .common import InfoExtractor def md5_text(text): diff --git a/youtube_dl/extractor/ir90tv.py b/youtube_dl/extractor/ir90tv.py index d5a3f6fa5..ee085edfe 100644 --- a/youtube_dl/extractor/ir90tv.py +++ b/youtube_dl/extractor/ir90tv.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import remove_start +from .common import InfoExtractor class Ir90TvIE(InfoExtractor): diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py index 0328c7093..53cd618f6 100644 --- a/youtube_dl/extractor/itv.py +++ b/youtube_dl/extractor/itv.py @@ -1,22 +1,22 @@ # coding: utf-8 from __future__ import unicode_literals +import json import uuid import xml.etree.ElementTree as etree -import json -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( - extract_attributes, - xpath_with_ns, - xpath_element, - xpath_text, - int_or_none, - parse_duration, ExtractorError, determine_ext, + extract_attributes, + int_or_none, + parse_duration, + xpath_element, + xpath_text, + xpath_with_ns, ) +from .common import InfoExtractor class ITVIE(InfoExtractor): diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py index 3d3c15024..8eae45d6c 100644 --- a/youtube_dl/extractor/ivi.py +++ b/youtube_dl/extractor/ivi.py @@ -1,15 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re +from ..utils import ExtractorError, int_or_none, qualities from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - qualities, -) class IviIE(InfoExtractor): diff --git a/youtube_dl/extractor/ivideon.py b/youtube_dl/extractor/ivideon.py index 3ca824f79..ed97859be 100644 --- a/youtube_dl/extractor/ivideon.py +++ b/youtube_dl/extractor/ivideon.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_urlparse, -) +from ..compat import compat_urllib_parse_urlencode, compat_urlparse from ..utils import qualities +from .common import InfoExtractor class IvideonIE(InfoExtractor): diff --git a/youtube_dl/extractor/iwara.py b/youtube_dl/extractor/iwara.py index 8d7e7f472..c23bb6f86 100644 --- a/youtube_dl/extractor/iwara.py +++ b/youtube_dl/extractor/iwara.py @@ -1,9 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse from ..utils import remove_end +from .common import InfoExtractor class IwaraIE(InfoExtractor): diff --git a/youtube_dl/extractor/izlesene.py b/youtube_dl/extractor/izlesene.py index b1d72177d..f2170c5eb 100644 --- a/youtube_dl/extractor/izlesene.py +++ b/youtube_dl/extractor/izlesene.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote from ..utils import ( determine_ext, @@ -13,6 +12,7 @@ from ..utils import ( parse_iso8601, str_to_int, ) +from .common import InfoExtractor class IzleseneIE(InfoExtractor): diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py index 595d7a5b7..0ed1d5cc0 100644 --- a/youtube_dl/extractor/jamendo.py +++ b/youtube_dl/extractor/jamendo.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import re from ..compat import compat_urlparse -from .common import InfoExtractor from ..utils import parse_duration +from .common import InfoExtractor class JamendoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/jove.py b/youtube_dl/extractor/jove.py index f9a034b78..cc69fc5af 100644 --- a/youtube_dl/extractor/jove.py +++ b/youtube_dl/extractor/jove.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, unified_strdate from .common import InfoExtractor -from ..utils import ( - ExtractorError, - unified_strdate -) class JoveIE(InfoExtractor): diff --git a/youtube_dl/extractor/jpopsukitv.py b/youtube_dl/extractor/jpopsukitv.py index 4b5f346d1..d4bc6bfce 100644 --- a/youtube_dl/extractor/jpopsukitv.py +++ b/youtube_dl/extractor/jpopsukitv.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) class JpopsukiIE(InfoExtractor): diff --git a/youtube_dl/extractor/jwplatform.py b/youtube_dl/extractor/jwplatform.py index aff7ab49a..6a1209c3d 100644 --- a/youtube_dl/extractor/jwplatform.py +++ b/youtube_dl/extractor/jwplatform.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( determine_ext, @@ -13,6 +12,7 @@ from ..utils import ( mimetype2ext, urljoin, ) +from .common import InfoExtractor class JWPlatformBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index 5ef382f9f..08ecbcf8e 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -1,21 +1,18 @@ # coding: utf-8 from __future__ import unicode_literals -import re import base64 +import re -from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_parse_qs, -) +from ..compat import compat_parse_qs, compat_urlparse from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, - unsmuggle_url, smuggle_url, + unsmuggle_url, ) +from .common import InfoExtractor class KalturaIE(InfoExtractor): diff --git a/youtube_dl/extractor/kamcord.py b/youtube_dl/extractor/kamcord.py index b50120d98..0c9e5dd7e 100644 --- a/youtube_dl/extractor/kamcord.py +++ b/youtube_dl/extractor/kamcord.py @@ -1,11 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - qualities, -) +from ..utils import int_or_none, qualities +from .common import InfoExtractor class KamcordIE(InfoExtractor): diff --git a/youtube_dl/extractor/kanalplay.py b/youtube_dl/extractor/kanalplay.py index 6c3498c67..af5f7d73c 100644 --- a/youtube_dl/extractor/kanalplay.py +++ b/youtube_dl/extractor/kanalplay.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, float_or_none, srt_subtitles_timecode from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - srt_subtitles_timecode, -) class KanalPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/kankan.py b/youtube_dl/extractor/kankan.py index a677ff447..b1eba7413 100644 --- a/youtube_dl/extractor/kankan.py +++ b/youtube_dl/extractor/kankan.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -import re import hashlib +import re from .common import InfoExtractor diff --git a/youtube_dl/extractor/karrierevideos.py b/youtube_dl/extractor/karrierevideos.py index 4e9eb67bf..88aa642d5 100644 --- a/youtube_dl/extractor/karrierevideos.py +++ b/youtube_dl/extractor/karrierevideos.py @@ -1,14 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( fix_xml_ampersands, float_or_none, - xpath_with_ns, xpath_text, + xpath_with_ns, ) +from .common import InfoExtractor class KarriereVideosIE(InfoExtractor): diff --git a/youtube_dl/extractor/keezmovies.py b/youtube_dl/extractor/keezmovies.py index e83115e2a..2f00aa92f 100644 --- a/youtube_dl/extractor/keezmovies.py +++ b/youtube_dl/extractor/keezmovies.py @@ -2,19 +2,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..aes import aes_decrypt_text -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, -) +from ..compat import compat_str, compat_urllib_parse_unquote from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, str_to_int, strip_or_none, ) +from .common import InfoExtractor class KeezMoviesIE(InfoExtractor): diff --git a/youtube_dl/extractor/khanacademy.py b/youtube_dl/extractor/khanacademy.py index 61739efa7..5f5a02d29 100644 --- a/youtube_dl/extractor/khanacademy.py +++ b/youtube_dl/extractor/khanacademy.py @@ -2,10 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import unified_strdate from .common import InfoExtractor -from ..utils import ( - unified_strdate, -) class KhanAcademyIE(InfoExtractor): diff --git a/youtube_dl/extractor/kickstarter.py b/youtube_dl/extractor/kickstarter.py index d4da8f484..45805b12e 100644 --- a/youtube_dl/extractor/kickstarter.py +++ b/youtube_dl/extractor/kickstarter.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import smuggle_url +from .common import InfoExtractor class KickStarterIE(InfoExtractor): diff --git a/youtube_dl/extractor/konserthusetplay.py b/youtube_dl/extractor/konserthusetplay.py index c11cbcf47..6e53964bb 100644 --- a/youtube_dl/extractor/konserthusetplay.py +++ b/youtube_dl/extractor/konserthusetplay.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - float_or_none, - int_or_none, -) +from ..utils import determine_ext, float_or_none, int_or_none +from .common import InfoExtractor class KonserthusetPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/kontrtube.py b/youtube_dl/extractor/kontrtube.py index 1fda45107..37c7b8dce 100644 --- a/youtube_dl/extractor/kontrtube.py +++ b/youtube_dl/extractor/kontrtube.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, -) class KontrTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/krasview.py b/youtube_dl/extractor/krasview.py index d27d052ff..c33edc6d9 100644 --- a/youtube_dl/extractor/krasview.py +++ b/youtube_dl/extractor/krasview.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import int_or_none, js_to_json from .common import InfoExtractor -from ..utils import ( - int_or_none, - js_to_json, -) class KrasViewIE(InfoExtractor): diff --git a/youtube_dl/extractor/kusi.py b/youtube_dl/extractor/kusi.py index 6a7e3baa7..7931e41a6 100644 --- a/youtube_dl/extractor/kusi.py +++ b/youtube_dl/extractor/kusi.py @@ -4,15 +4,15 @@ from __future__ import unicode_literals import random import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote_plus from ..utils import ( - int_or_none, float_or_none, + int_or_none, timeconvert, update_url_query, xpath_text, ) +from .common import InfoExtractor class KUSIIE(InfoExtractor): diff --git a/youtube_dl/extractor/kuwo.py b/youtube_dl/extractor/kuwo.py index 63e10125e..bdde1b678 100644 --- a/youtube_dl/extractor/kuwo.py +++ b/youtube_dl/extractor/kuwo.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - get_element_by_id, - clean_html, ExtractorError, InAdvancePagedList, + clean_html, + get_element_by_id, remove_start, ) +from .common import InfoExtractor class KuwoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/la7.py b/youtube_dl/extractor/la7.py index da5a5de4a..7ae1dcb41 100644 --- a/youtube_dl/extractor/la7.py +++ b/youtube_dl/extractor/la7.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import js_to_json, smuggle_url from .common import InfoExtractor -from ..utils import ( - js_to_json, - smuggle_url, -) class LA7IE(InfoExtractor): diff --git a/youtube_dl/extractor/laola1tv.py b/youtube_dl/extractor/laola1tv.py index 3190b187c..e9d4708d6 100644 --- a/youtube_dl/extractor/laola1tv.py +++ b/youtube_dl/extractor/laola1tv.py @@ -1,16 +1,16 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( ExtractorError, unified_strdate, + update_url_query, urlencode_postdata, + urljoin, xpath_element, xpath_text, - urljoin, - update_url_query, ) +from .common import InfoExtractor class Laola1TvEmbedIE(InfoExtractor): diff --git a/youtube_dl/extractor/lcp.py b/youtube_dl/extractor/lcp.py index ade27a99e..9e741cbb6 100644 --- a/youtube_dl/extractor/lcp.py +++ b/youtube_dl/extractor/lcp.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from .arkena import ArkenaIE +from .common import InfoExtractor class LcpPlayIE(ArkenaIE): diff --git a/youtube_dl/extractor/lecture2go.py b/youtube_dl/extractor/lecture2go.py index 81b5d41be..9c360d7ca 100644 --- a/youtube_dl/extractor/lecture2go.py +++ b/youtube_dl/extractor/lecture2go.py @@ -3,13 +3,13 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( determine_ext, determine_protocol, - parse_duration, int_or_none, + parse_duration, ) +from .common import InfoExtractor class Lecture2GoIE(InfoExtractor): diff --git a/youtube_dl/extractor/leeco.py b/youtube_dl/extractor/leeco.py index 4321f90c8..b63e236e3 100644 --- a/youtube_dl/extractor/leeco.py +++ b/youtube_dl/extractor/leeco.py @@ -7,24 +7,20 @@ import hashlib import re import time -from .common import InfoExtractor -from ..compat import ( - compat_ord, - compat_str, - compat_urllib_parse_urlencode, -) +from ..compat import compat_ord, compat_str, compat_urllib_parse_urlencode from ..utils import ( + ExtractorError, determine_ext, encode_data_uri, - ExtractorError, int_or_none, orderedSet, parse_iso8601, str_or_none, + update_url_query, url_basename, urshift, - update_url_query, ) +from .common import InfoExtractor class LeIE(InfoExtractor): diff --git a/youtube_dl/extractor/lego.py b/youtube_dl/extractor/lego.py index d3bca6435..3eac1df51 100644 --- a/youtube_dl/extractor/lego.py +++ b/youtube_dl/extractor/lego.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - unescapeHTML, - parse_duration, - get_element_by_class, -) +from ..utils import get_element_by_class, parse_duration, unescapeHTML +from .common import InfoExtractor class LEGOIE(InfoExtractor): diff --git a/youtube_dl/extractor/libraryofcongress.py b/youtube_dl/extractor/libraryofcongress.py index 40295a30b..400320b4f 100644 --- a/youtube_dl/extractor/libraryofcongress.py +++ b/youtube_dl/extractor/libraryofcongress.py @@ -3,15 +3,9 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, float_or_none, int_or_none, parse_filesize from .common import InfoExtractor -from ..utils import ( - determine_ext, - float_or_none, - int_or_none, - parse_filesize, -) - class LibraryOfCongressIE(InfoExtractor): IE_NAME = 'loc' diff --git a/youtube_dl/extractor/libsyn.py b/youtube_dl/extractor/libsyn.py index 4750b03a3..226408cbd 100644 --- a/youtube_dl/extractor/libsyn.py +++ b/youtube_dl/extractor/libsyn.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class LibsynIE(InfoExtractor): diff --git a/youtube_dl/extractor/lifenews.py b/youtube_dl/extractor/lifenews.py index 42e263bfa..bcf484009 100644 --- a/youtube_dl/extractor/lifenews.py +++ b/youtube_dl/extractor/lifenews.py @@ -3,18 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_iso8601, remove_end, ) +from .common import InfoExtractor class LifeNewsIE(InfoExtractor): diff --git a/youtube_dl/extractor/limelight.py b/youtube_dl/extractor/limelight.py index e635f3c4d..51b79acd3 100644 --- a/youtube_dl/extractor/limelight.py +++ b/youtube_dl/extractor/limelight.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, float_or_none, int_or_none from .common import InfoExtractor -from ..utils import ( - determine_ext, - float_or_none, - int_or_none, -) class LimelightBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/litv.py b/youtube_dl/extractor/litv.py index 337b1b15c..1457bfd72 100644 --- a/youtube_dl/extractor/litv.py +++ b/youtube_dl/extractor/litv.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import ExtractorError, int_or_none, smuggle_url, unsmuggle_url from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - smuggle_url, - unsmuggle_url, -) class LiTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index c7de65353..a884245b8 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class LiveLeakIE(InfoExtractor): diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py index c863413bf..b52583a05 100644 --- a/youtube_dl/extractor/livestream.py +++ b/youtube_dl/extractor/livestream.py @@ -1,25 +1,22 @@ from __future__ import unicode_literals -import re import itertools +import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - find_xpath_attr, - xpath_attr, - xpath_with_ns, - xpath_text, - orderedSet, - update_url_query, - int_or_none, - float_or_none, - parse_iso8601, determine_ext, + find_xpath_attr, + float_or_none, + int_or_none, + orderedSet, + parse_iso8601, + update_url_query, + xpath_attr, + xpath_text, + xpath_with_ns, ) +from .common import InfoExtractor class LivestreamIE(InfoExtractor): diff --git a/youtube_dl/extractor/lnkgo.py b/youtube_dl/extractor/lnkgo.py index 068378c9c..ec237eda9 100644 --- a/youtube_dl/extractor/lnkgo.py +++ b/youtube_dl/extractor/lnkgo.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) class LnkGoIE(InfoExtractor): diff --git a/youtube_dl/extractor/lrt.py b/youtube_dl/extractor/lrt.py index f5c997ef4..cbf8c209e 100644 --- a/youtube_dl/extractor/lrt.py +++ b/youtube_dl/extractor/lrt.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, int_or_none, parse_duration, remove_end from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - parse_duration, - remove_end, -) class LRTIE(InfoExtractor): diff --git a/youtube_dl/extractor/lynda.py b/youtube_dl/extractor/lynda.py index da94eab56..137f3a755 100644 --- a/youtube_dl/extractor/lynda.py +++ b/youtube_dl/extractor/lynda.py @@ -2,17 +2,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_HTTPError, compat_str, compat_urlparse +from ..utils import ExtractorError, int_or_none, urlencode_postdata from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - int_or_none, - urlencode_postdata, -) class LyndaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/macgamestore.py b/youtube_dl/extractor/macgamestore.py index 43db9929c..94d673579 100644 --- a/youtube_dl/extractor/macgamestore.py +++ b/youtube_dl/extractor/macgamestore.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class MacGameStoreIE(InfoExtractor): diff --git a/youtube_dl/extractor/mailru.py b/youtube_dl/extractor/mailru.py index f7cc3c832..2a70a8f5b 100644 --- a/youtube_dl/extractor/mailru.py +++ b/youtube_dl/extractor/mailru.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, remove_end from .common import InfoExtractor -from ..utils import ( - int_or_none, - remove_end, -) class MailRuIE(InfoExtractor): diff --git a/youtube_dl/extractor/mangomolo.py b/youtube_dl/extractor/mangomolo.py index 1885ac7df..d0aa02da2 100644 --- a/youtube_dl/extractor/mangomolo.py +++ b/youtube_dl/extractor/mangomolo.py @@ -3,11 +3,9 @@ from __future__ import unicode_literals import base64 -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote -from ..utils import ( - int_or_none, -) +from ..utils import int_or_none +from .common import InfoExtractor class MangomoloBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/matchtv.py b/youtube_dl/extractor/matchtv.py index bc9933a81..cf3ddf9c2 100644 --- a/youtube_dl/extractor/matchtv.py +++ b/youtube_dl/extractor/matchtv.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import random -from .common import InfoExtractor from ..utils import xpath_text +from .common import InfoExtractor class MatchTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/mdr.py b/youtube_dl/extractor/mdr.py index 6e4290aad..fa76f3387 100644 --- a/youtube_dl/extractor/mdr.py +++ b/youtube_dl/extractor/mdr.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( determine_ext, @@ -10,6 +9,7 @@ from ..utils import ( parse_iso8601, xpath_text, ) +from .common import InfoExtractor class MDRIE(InfoExtractor): diff --git a/youtube_dl/extractor/meipai.py b/youtube_dl/extractor/meipai.py index c8eacb4f4..b8da6607a 100644 --- a/youtube_dl/extractor/meipai.py +++ b/youtube_dl/extractor/meipai.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_duration, unified_timestamp from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - unified_timestamp, -) class MeipaiIE(InfoExtractor): diff --git a/youtube_dl/extractor/melonvod.py b/youtube_dl/extractor/melonvod.py index bd8cf13ab..aeafda2b5 100644 --- a/youtube_dl/extractor/melonvod.py +++ b/youtube_dl/extractor/melonvod.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, urljoin from .common import InfoExtractor -from ..utils import ( - int_or_none, - urljoin, -) class MelonVODIE(InfoExtractor): diff --git a/youtube_dl/extractor/meta.py b/youtube_dl/extractor/meta.py index cdb46e163..104f2ca1b 100644 --- a/youtube_dl/extractor/meta.py +++ b/youtube_dl/extractor/meta.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, int_or_none, unescapeHTML from .common import InfoExtractor from .pladform import PladformIE -from ..utils import ( - unescapeHTML, - int_or_none, - ExtractorError, -) class METAIE(InfoExtractor): diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py index 9880924e6..f443b02a1 100644 --- a/youtube_dl/extractor/metacafe.py +++ b/youtube_dl/extractor/metacafe.py @@ -2,19 +2,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_unquote, -) +from ..compat import compat_parse_qs, compat_urllib_parse_unquote from ..utils import ( - determine_ext, ExtractorError, - int_or_none, - urlencode_postdata, + determine_ext, get_element_by_attribute, + int_or_none, mimetype2ext, + urlencode_postdata, ) +from .common import InfoExtractor class MetacafeIE(InfoExtractor): diff --git a/youtube_dl/extractor/metacritic.py b/youtube_dl/extractor/metacritic.py index 7d468d78b..066cd5e34 100644 --- a/youtube_dl/extractor/metacritic.py +++ b/youtube_dl/extractor/metacritic.py @@ -2,10 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import fix_xml_ampersands from .common import InfoExtractor -from ..utils import ( - fix_xml_ampersands, -) class MetacriticIE(InfoExtractor): diff --git a/youtube_dl/extractor/mgoon.py b/youtube_dl/extractor/mgoon.py index 7bb473900..412149876 100644 --- a/youtube_dl/extractor/mgoon.py +++ b/youtube_dl/extractor/mgoon.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, qualities, unified_strdate from .common import InfoExtractor -from ..utils import ( - ExtractorError, - qualities, - unified_strdate, -) class MgoonIE(InfoExtractor): diff --git a/youtube_dl/extractor/mgtv.py b/youtube_dl/extractor/mgtv.py index 659ede8c2..a93fcd14d 100644 --- a/youtube_dl/extractor/mgtv.py +++ b/youtube_dl/extractor/mgtv.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class MGTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/microsoftvirtualacademy.py b/youtube_dl/extractor/microsoftvirtualacademy.py index 8e0aee0e6..162d3c054 100644 --- a/youtube_dl/extractor/microsoftvirtualacademy.py +++ b/youtube_dl/extractor/microsoftvirtualacademy.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_xpath, -) +from ..compat import compat_xpath from ..utils import ( int_or_none, parse_duration, @@ -13,6 +10,7 @@ from ..utils import ( unsmuggle_url, xpath_text, ) +from .common import InfoExtractor class MicrosoftVirtualAcademyBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/minhateca.py b/youtube_dl/extractor/minhateca.py index dccc54249..c4cc14bd0 100644 --- a/youtube_dl/extractor/minhateca.py +++ b/youtube_dl/extractor/minhateca.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( int_or_none, parse_duration, @@ -9,6 +8,7 @@ from ..utils import ( sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class MinhatecaIE(InfoExtractor): diff --git a/youtube_dl/extractor/ministrygrid.py b/youtube_dl/extractor/ministrygrid.py index 8ad9239c5..4583e3c44 100644 --- a/youtube_dl/extractor/ministrygrid.py +++ b/youtube_dl/extractor/ministrygrid.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import ExtractorError, smuggle_url from .common import InfoExtractor -from ..utils import ( - ExtractorError, - smuggle_url, -) class MinistryGridIE(InfoExtractor): diff --git a/youtube_dl/extractor/minoto.py b/youtube_dl/extractor/minoto.py index 959a10589..de04d811c 100644 --- a/youtube_dl/extractor/minoto.py +++ b/youtube_dl/extractor/minoto.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class MinotoIE(InfoExtractor): diff --git a/youtube_dl/extractor/miomio.py b/youtube_dl/extractor/miomio.py index ec1b4c4fe..6de7dd5db 100644 --- a/youtube_dl/extractor/miomio.py +++ b/youtube_dl/extractor/miomio.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import random -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - xpath_text, - int_or_none, - ExtractorError, - sanitized_Request, -) +from ..utils import ExtractorError, int_or_none, sanitized_Request, xpath_text +from .common import InfoExtractor class MioMioIE(InfoExtractor): diff --git a/youtube_dl/extractor/mit.py b/youtube_dl/extractor/mit.py index 1aea78d11..14f9ef682 100644 --- a/youtube_dl/extractor/mit.py +++ b/youtube_dl/extractor/mit.py @@ -1,15 +1,11 @@ from __future__ import unicode_literals -import re import json +import re +from ..utils import ExtractorError, clean_html, get_element_by_id from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - clean_html, - ExtractorError, - get_element_by_id, -) class TechTVMITIE(InfoExtractor): diff --git a/youtube_dl/extractor/mitele.py b/youtube_dl/extractor/mitele.py index 79e0b8ada..82769f7d1 100644 --- a/youtube_dl/extractor/mitele.py +++ b/youtube_dl/extractor/mitele.py @@ -3,19 +3,15 @@ from __future__ import unicode_literals import uuid -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, - compat_urlparse, -) +from ..compat import compat_str, compat_urllib_parse_urlencode, compat_urlparse from ..utils import ( - int_or_none, - extract_attributes, determine_ext, - smuggle_url, + extract_attributes, + int_or_none, parse_duration, + smuggle_url, ) +from .common import InfoExtractor class MiTeleBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py index a24b3165a..5c4e08490 100644 --- a/youtube_dl/extractor/mixcloud.py +++ b/youtube_dl/extractor/mixcloud.py @@ -5,19 +5,14 @@ import functools import itertools import re -from .common import InfoExtractor from ..compat import ( compat_chr, compat_ord, compat_urllib_parse_unquote, compat_urlparse, ) -from ..utils import ( - clean_html, - ExtractorError, - OnDemandPagedList, - str_to_int, -) +from ..utils import ExtractorError, OnDemandPagedList, clean_html, str_to_int +from .common import InfoExtractor class MixcloudIE(InfoExtractor): diff --git a/youtube_dl/extractor/mlb.py b/youtube_dl/extractor/mlb.py index 59cd4b838..afad55728 100644 --- a/youtube_dl/extractor/mlb.py +++ b/youtube_dl/extractor/mlb.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_duration, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, -) class MLBIE(InfoExtractor): diff --git a/youtube_dl/extractor/mnet.py b/youtube_dl/extractor/mnet.py index 6a85dcbd5..7ba7dca53 100644 --- a/youtube_dl/extractor/mnet.py +++ b/youtube_dl/extractor/mnet.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_duration, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, - parse_iso8601, -) class MnetIE(InfoExtractor): diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py index 44bcc4982..4790a67d5 100644 --- a/youtube_dl/extractor/moevideo.py +++ b/youtube_dl/extractor/moevideo.py @@ -4,13 +4,13 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class MoeVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/mofosex.py b/youtube_dl/extractor/mofosex.py index 54716f5c7..5c94d4137 100644 --- a/youtube_dl/extractor/mofosex.py +++ b/youtube_dl/extractor/mofosex.py @@ -1,10 +1,6 @@ from __future__ import unicode_literals -from ..utils import ( - int_or_none, - str_to_int, - unified_strdate, -) +from ..utils import int_or_none, str_to_int, unified_strdate from .keezmovies import KeezMoviesIE diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dl/extractor/mojvideo.py index 165e658c9..2a5c50a35 100644 --- a/youtube_dl/extractor/mojvideo.py +++ b/youtube_dl/extractor/mojvideo.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, parse_duration from .common import InfoExtractor -from ..utils import ( - ExtractorError, - parse_duration, -) class MojvideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/moniker.py b/youtube_dl/extractor/moniker.py index b208820fe..d26d80d76 100644 --- a/youtube_dl/extractor/moniker.py +++ b/youtube_dl/extractor/moniker.py @@ -4,13 +4,13 @@ from __future__ import unicode_literals import os.path import re -from .common import InfoExtractor from ..utils import ( ExtractorError, remove_start, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class MonikerIE(InfoExtractor): diff --git a/youtube_dl/extractor/motherless.py b/youtube_dl/extractor/motherless.py index 6fe3b6049..f0d7e12e6 100644 --- a/youtube_dl/extractor/motherless.py +++ b/youtube_dl/extractor/motherless.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import datetime import re +from ..utils import ExtractorError, str_to_int, unified_strdate from .common import InfoExtractor -from ..utils import ( - ExtractorError, - str_to_int, - unified_strdate, -) class MotherlessIE(InfoExtractor): diff --git a/youtube_dl/extractor/motorsport.py b/youtube_dl/extractor/motorsport.py index c9d1ab64d..3cea92975 100644 --- a/youtube_dl/extractor/motorsport.py +++ b/youtube_dl/extractor/motorsport.py @@ -1,10 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_urlparse from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) class MotorsportIE(InfoExtractor): diff --git a/youtube_dl/extractor/movieclips.py b/youtube_dl/extractor/movieclips.py index 5453da1ac..b3c9d5692 100644 --- a/youtube_dl/extractor/movieclips.py +++ b/youtube_dl/extractor/movieclips.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import float_or_none, parse_iso8601, smuggle_url, update_url_query from .common import InfoExtractor -from ..utils import ( - smuggle_url, - float_or_none, - parse_iso8601, - update_url_query, -) class MovieClipsIE(InfoExtractor): diff --git a/youtube_dl/extractor/movingimage.py b/youtube_dl/extractor/movingimage.py index 4f62d628a..41eb63c64 100644 --- a/youtube_dl/extractor/movingimage.py +++ b/youtube_dl/extractor/movingimage.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import parse_duration, unescapeHTML from .common import InfoExtractor -from ..utils import ( - unescapeHTML, - parse_duration, -) class MovingImageIE(InfoExtractor): diff --git a/youtube_dl/extractor/mpora.py b/youtube_dl/extractor/mpora.py index 5a1bee5c8..ff23548b2 100644 --- a/youtube_dl/extractor/mpora.py +++ b/youtube_dl/extractor/mpora.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class MporaIE(InfoExtractor): diff --git a/youtube_dl/extractor/msn.py b/youtube_dl/extractor/msn.py index 1473bcf48..686586fe9 100644 --- a/youtube_dl/extractor/msn.py +++ b/youtube_dl/extractor/msn.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - determine_ext, - ExtractorError, - int_or_none, - unescapeHTML, -) +from ..utils import ExtractorError, determine_ext, int_or_none, unescapeHTML +from .common import InfoExtractor class MSNIE(InfoExtractor): diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py index 8acea1461..ecf8239b2 100644 --- a/youtube_dl/extractor/mtv.py +++ b/youtube_dl/extractor/mtv.py @@ -2,18 +2,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_xpath, -) +from ..compat import compat_str, compat_xpath from ..utils import ( ExtractorError, + HEADRequest, + RegexNotFoundError, find_xpath_attr, fix_xml_ampersands, float_or_none, - HEADRequest, - RegexNotFoundError, sanitized_Request, strip_or_none, timeconvert, @@ -23,6 +19,7 @@ from ..utils import ( url_basename, xpath_text, ) +from .common import InfoExtractor def _media_xml_tag(tag): diff --git a/youtube_dl/extractor/muenchentv.py b/youtube_dl/extractor/muenchentv.py index 2cc2bf229..536a53cf6 100644 --- a/youtube_dl/extractor/muenchentv.py +++ b/youtube_dl/extractor/muenchentv.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import determine_ext, int_or_none, js_to_json from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - js_to_json, -) class MuenchenTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/musicplayon.py b/youtube_dl/extractor/musicplayon.py index 1854d59a5..4f6325efd 100644 --- a/youtube_dl/extractor/musicplayon.py +++ b/youtube_dl/extractor/musicplayon.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - mimetype2ext, -) +from ..utils import int_or_none, js_to_json, mimetype2ext +from .common import InfoExtractor class MusicPlayOnIE(InfoExtractor): diff --git a/youtube_dl/extractor/mwave.py b/youtube_dl/extractor/mwave.py index a67276596..e7ac0ffe9 100644 --- a/youtube_dl/extractor/mwave.py +++ b/youtube_dl/extractor/mwave.py @@ -1,11 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_duration, -) +from ..utils import int_or_none, parse_duration +from .common import InfoExtractor class MwaveIE(InfoExtractor): diff --git a/youtube_dl/extractor/myspace.py b/youtube_dl/extractor/myspace.py index ab32e632e..4a0a9dcda 100644 --- a/youtube_dl/extractor/myspace.py +++ b/youtube_dl/extractor/myspace.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) class MySpaceIE(InfoExtractor): diff --git a/youtube_dl/extractor/myspass.py b/youtube_dl/extractor/myspass.py index 2afe535b5..409707398 100644 --- a/youtube_dl/extractor/myspass.py +++ b/youtube_dl/extractor/myspass.py @@ -1,13 +1,10 @@ from __future__ import unicode_literals + import os.path +from ..compat import compat_urllib_parse_urlparse +from ..utils import ExtractorError from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, -) class MySpassIE(InfoExtractor): diff --git a/youtube_dl/extractor/myvideo.py b/youtube_dl/extractor/myvideo.py index 6bb64eb63..c2f3d928e 100644 --- a/youtube_dl/extractor/myvideo.py +++ b/youtube_dl/extractor/myvideo.py @@ -1,21 +1,18 @@ from __future__ import unicode_literals -import binascii import base64 +import binascii import hashlib -import re import json +import re -from .common import InfoExtractor from ..compat import ( compat_ord, compat_urllib_parse_unquote, compat_urllib_parse_urlencode, ) -from ..utils import ( - ExtractorError, - sanitized_Request, -) +from ..utils import ExtractorError, sanitized_Request +from .common import InfoExtractor class MyVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/nationalgeographic.py b/youtube_dl/extractor/nationalgeographic.py index b91d86528..c1b498637 100644 --- a/youtube_dl/extractor/nationalgeographic.py +++ b/youtube_dl/extractor/nationalgeographic.py @@ -2,15 +2,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from .adobepass import AdobePassIE -from .theplatform import ThePlatformIE from ..utils import ( - smuggle_url, - url_basename, - update_url_query, get_element_by_class, + smuggle_url, + update_url_query, + url_basename, ) +from .adobepass import AdobePassIE +from .common import InfoExtractor +from .theplatform import ThePlatformIE class NationalGeographicVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/naver.py b/youtube_dl/extractor/naver.py index e8131333f..fc3458ef2 100644 --- a/youtube_dl/extractor/naver.py +++ b/youtube_dl/extractor/naver.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, update_url_query from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - update_url_query, -) class NaverIE(InfoExtractor): diff --git a/youtube_dl/extractor/nba.py b/youtube_dl/extractor/nba.py index 53561961c..8b7ef8dce 100644 --- a/youtube_dl/extractor/nba.py +++ b/youtube_dl/extractor/nba.py @@ -3,15 +3,9 @@ from __future__ import unicode_literals import functools import re +from ..compat import compat_urllib_parse_urlencode, compat_urlparse +from ..utils import OnDemandPagedList, remove_start from .turner import TurnerBaseIE -from ..compat import ( - compat_urllib_parse_urlencode, - compat_urlparse, -) -from ..utils import ( - OnDemandPagedList, - remove_start, -) class NBAIE(TurnerBaseIE): diff --git a/youtube_dl/extractor/nbc.py b/youtube_dl/extractor/nbc.py index 434a94de4..1f43272f5 100644 --- a/youtube_dl/extractor/nbc.py +++ b/youtube_dl/extractor/nbc.py @@ -2,8 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from .theplatform import ThePlatformIE from ..utils import ( find_xpath_attr, lowercase_escape, @@ -11,6 +9,8 @@ from ..utils import ( unescapeHTML, update_url_query, ) +from .common import InfoExtractor +from .theplatform import ThePlatformIE class NBCIE(InfoExtractor): diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py index 07528d140..d7900bc7d 100644 --- a/youtube_dl/extractor/ndr.py +++ b/youtube_dl/extractor/ndr.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, int_or_none, parse_iso8601, qualities from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - parse_iso8601, - qualities, -) class NDRBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/ndtv.py b/youtube_dl/extractor/ndtv.py index 255f60878..c306daf64 100644 --- a/youtube_dl/extractor/ndtv.py +++ b/youtube_dl/extractor/ndtv.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none, remove_end, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - remove_end, - unified_strdate, -) class NDTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py index 978a05841..d9e4d2558 100644 --- a/youtube_dl/extractor/neteasemusic.py +++ b/youtube_dl/extractor/neteasemusic.py @@ -1,21 +1,18 @@ # coding: utf-8 from __future__ import unicode_literals -from hashlib import md5 +import re from base64 import b64encode from datetime import datetime -import re +from hashlib import md5 -from .common import InfoExtractor from ..compat import ( - compat_urllib_parse_urlencode, - compat_str, compat_itertools_count, + compat_str, + compat_urllib_parse_urlencode, ) -from ..utils import ( - sanitized_Request, - float_or_none, -) +from ..utils import float_or_none, sanitized_Request +from .common import InfoExtractor class NetEaseMusicBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/netzkino.py b/youtube_dl/extractor/netzkino.py index aec3026b1..705242f65 100644 --- a/youtube_dl/extractor/netzkino.py +++ b/youtube_dl/extractor/netzkino.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import clean_html, int_or_none, js_to_json, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, - js_to_json, - parse_iso8601, -) class NetzkinoIE(InfoExtractor): diff --git a/youtube_dl/extractor/newstube.py b/youtube_dl/extractor/newstube.py index e3f35f1d8..720cfd866 100644 --- a/youtube_dl/extractor/newstube.py +++ b/youtube_dl/extractor/newstube.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, -) class NewstubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/nextmedia.py b/youtube_dl/extractor/nextmedia.py index 680f03aad..e66f065e6 100644 --- a/youtube_dl/extractor/nextmedia.py +++ b/youtube_dl/extractor/nextmedia.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( clean_html, @@ -11,6 +10,7 @@ from ..utils import ( remove_start, unified_timestamp, ) +from .common import InfoExtractor class NextMediaIE(InfoExtractor): diff --git a/youtube_dl/extractor/nfb.py b/youtube_dl/extractor/nfb.py index adcc636bc..6867b7361 100644 --- a/youtube_dl/extractor/nfb.py +++ b/youtube_dl/extractor/nfb.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( clean_html, determine_ext, @@ -9,6 +8,7 @@ from ..utils import ( urlencode_postdata, xpath_text, ) +from .common import InfoExtractor class NFBIE(InfoExtractor): diff --git a/youtube_dl/extractor/nfl.py b/youtube_dl/extractor/nfl.py index 460deb162..b1f004957 100644 --- a/youtube_dl/extractor/nfl.py +++ b/youtube_dl/extractor/nfl.py @@ -3,15 +3,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_urllib_parse_urlparse +from ..utils import ExtractorError, int_or_none, remove_end from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, - int_or_none, - remove_end, -) class NFLIE(InfoExtractor): diff --git a/youtube_dl/extractor/nhk.py b/youtube_dl/extractor/nhk.py index 5c8cd76dc..f5cd86f52 100644 --- a/youtube_dl/extractor/nhk.py +++ b/youtube_dl/extractor/nhk.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class NhkVodIE(InfoExtractor): diff --git a/youtube_dl/extractor/nhl.py b/youtube_dl/extractor/nhl.py index 62ce800c0..f53178b57 100644 --- a/youtube_dl/extractor/nhl.py +++ b/youtube_dl/extractor/nhl.py @@ -1,23 +1,23 @@ from __future__ import unicode_literals -import re import json import os +import re -from .common import InfoExtractor from ..compat import ( - compat_urlparse, + compat_str, compat_urllib_parse_urlencode, compat_urllib_parse_urlparse, - compat_str, + compat_urlparse, ) from ..utils import ( - unified_strdate, determine_ext, int_or_none, - parse_iso8601, parse_duration, + parse_iso8601, + unified_strdate, ) +from .common import InfoExtractor class NHLBaseInfoExtractor(InfoExtractor): diff --git a/youtube_dl/extractor/nick.py b/youtube_dl/extractor/nick.py index 08a75929e..4718efacf 100644 --- a/youtube_dl/extractor/nick.py +++ b/youtube_dl/extractor/nick.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .mtv import MTVServicesInfoExtractor from ..utils import update_url_query +from .mtv import MTVServicesInfoExtractor class NickIE(MTVServicesInfoExtractor): diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py index 8baac23e4..1eded4d09 100644 --- a/youtube_dl/extractor/niconico.py +++ b/youtube_dl/extractor/niconico.py @@ -1,24 +1,22 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import json import datetime +import json +import re -from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) +from ..compat import compat_urlparse from ..utils import ( ExtractorError, + determine_ext, int_or_none, parse_duration, parse_iso8601, sanitized_Request, - xpath_text, - determine_ext, urlencode_postdata, + xpath_text, ) +from .common import InfoExtractor class NiconicoIE(InfoExtractor): diff --git a/youtube_dl/extractor/ninecninemedia.py b/youtube_dl/extractor/ninecninemedia.py index ec4d675e2..706a9a12a 100644 --- a/youtube_dl/extractor/ninecninemedia.py +++ b/youtube_dl/extractor/ninecninemedia.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_iso8601, - float_or_none, - ExtractorError, - int_or_none, -) +from ..utils import ExtractorError, float_or_none, int_or_none, parse_iso8601 +from .common import InfoExtractor class NineCNineMediaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/ninegag.py b/youtube_dl/extractor/ninegag.py index a06d38afd..c5543dc35 100644 --- a/youtube_dl/extractor/ninegag.py +++ b/youtube_dl/extractor/ninegag.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import str_to_int +from .common import InfoExtractor class NineGagIE(InfoExtractor): diff --git a/youtube_dl/extractor/ninenow.py b/youtube_dl/extractor/ninenow.py index 351bea7ba..7d8900a17 100644 --- a/youtube_dl/extractor/ninenow.py +++ b/youtube_dl/extractor/ninenow.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - float_or_none, - ExtractorError, -) +from ..utils import ExtractorError, float_or_none, int_or_none +from .common import InfoExtractor class NineNowIE(InfoExtractor): diff --git a/youtube_dl/extractor/nintendo.py b/youtube_dl/extractor/nintendo.py index 4b4e66b05..753ebac35 100644 --- a/youtube_dl/extractor/nintendo.py +++ b/youtube_dl/extractor/nintendo.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals import re +from ..utils import unescapeHTML from .common import InfoExtractor from .ooyala import OoyalaIE -from ..utils import unescapeHTML class NintendoIE(InfoExtractor): diff --git a/youtube_dl/extractor/nobelprize.py b/youtube_dl/extractor/nobelprize.py index 4dfdb09d6..17ccef281 100644 --- a/youtube_dl/extractor/nobelprize.py +++ b/youtube_dl/extractor/nobelprize.py @@ -1,15 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( - js_to_json, - mimetype2ext, determine_ext, - update_url_query, get_element_by_attribute, int_or_none, + js_to_json, + mimetype2ext, + update_url_query, ) +from .common import InfoExtractor class NobelPrizeIE(InfoExtractor): diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index 70ff2ab36..c7049d314 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -1,24 +1,21 @@ # coding: utf-8 from __future__ import unicode_literals +import hashlib import re import time -import hashlib -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - clean_html, ExtractorError, - int_or_none, + clean_html, float_or_none, + int_or_none, parse_iso8601, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class NocoIE(InfoExtractor): diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dl/extractor/normalboots.py index 61fe571df..543342021 100644 --- a/youtube_dl/extractor/normalboots.py +++ b/youtube_dl/extractor/normalboots.py @@ -1,13 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import unified_strdate from .common import InfoExtractor from .jwplatform import JWPlatformIE -from ..utils import ( - unified_strdate, -) - class NormalbootsIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?normalboots\.com/video/(?P[0-9a-z-]*)/?$' diff --git a/youtube_dl/extractor/nosvideo.py b/youtube_dl/extractor/nosvideo.py index 53c500c35..c235b1c8e 100644 --- a/youtube_dl/extractor/nosvideo.py +++ b/youtube_dl/extractor/nosvideo.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( ExtractorError, sanitized_Request, @@ -11,6 +10,7 @@ from ..utils import ( xpath_text, xpath_with_ns, ) +from .common import InfoExtractor _x = lambda p: xpath_with_ns(p, {'xspf': 'http://xspf.org/ns/0/'}) diff --git a/youtube_dl/extractor/nova.py b/youtube_dl/extractor/nova.py index 06cb8cb3f..333091dea 100644 --- a/youtube_dl/extractor/nova.py +++ b/youtube_dl/extractor/nova.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import clean_html, unified_strdate from .common import InfoExtractor -from ..utils import ( - clean_html, - unified_strdate, -) class NovaIE(InfoExtractor): diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py index 829c71960..02f2dda45 100644 --- a/youtube_dl/extractor/novamov.py +++ b/youtube_dl/extractor/novamov.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - ExtractorError, NO_DEFAULT, + ExtractorError, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class NovaMovIE(InfoExtractor): diff --git a/youtube_dl/extractor/nowness.py b/youtube_dl/extractor/nowness.py index b6c5ee6e4..4f9c23511 100644 --- a/youtube_dl/extractor/nowness.py +++ b/youtube_dl/extractor/nowness.py @@ -1,16 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, -) -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - sanitized_Request, -) +from ..utils import ExtractorError, sanitized_Request +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE +from .common import InfoExtractor class NownessBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/nowtv.py b/youtube_dl/extractor/nowtv.py index e43b37136..e57720c4d 100644 --- a/youtube_dl/extractor/nowtv.py +++ b/youtube_dl/extractor/nowtv.py @@ -3,16 +3,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( ExtractorError, determine_ext, int_or_none, - parse_iso8601, parse_duration, + parse_iso8601, remove_start, ) +from .common import InfoExtractor class NowTVBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/noz.py b/youtube_dl/extractor/noz.py index ccafd7723..ab702ac0a 100644 --- a/youtube_dl/extractor/noz.py +++ b/youtube_dl/extractor/noz.py @@ -1,17 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_urllib_parse_unquote, compat_xpath +from ..utils import find_xpath_attr, int_or_none, update_url_query, xpath_text from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_xpath, -) -from ..utils import ( - int_or_none, - find_xpath_attr, - xpath_text, - update_url_query, -) class NozIE(InfoExtractor): diff --git a/youtube_dl/extractor/npo.py b/youtube_dl/extractor/npo.py index 962437145..5db882432 100644 --- a/youtube_dl/extractor/npo.py +++ b/youtube_dl/extractor/npo.py @@ -2,17 +2,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( + ExtractorError, fix_xml_ampersands, orderedSet, parse_duration, qualities, strip_jsonp, unified_strdate, - ExtractorError, ) +from .common import InfoExtractor class NPOBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/npr.py b/youtube_dl/extractor/npr.py index 1777aa10b..9449fdf9b 100644 --- a/youtube_dl/extractor/npr.py +++ b/youtube_dl/extractor/npr.py @@ -1,11 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlencode -from ..utils import ( - int_or_none, - qualities, -) +from ..utils import int_or_none, qualities +from .common import InfoExtractor class NprIE(InfoExtractor): diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py index ea7be005a..6437861bc 100644 --- a/youtube_dl/extractor/nrk.py +++ b/youtube_dl/extractor/nrk.py @@ -4,7 +4,6 @@ from __future__ import unicode_literals import random import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote from ..utils import ( ExtractorError, @@ -12,6 +11,7 @@ from ..utils import ( parse_age_limit, parse_duration, ) +from .common import InfoExtractor class NRKBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/ntvde.py b/youtube_dl/extractor/ntvde.py index 101a5374c..4e74f5849 100644 --- a/youtube_dl/extractor/ntvde.py +++ b/youtube_dl/extractor/ntvde.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - parse_duration, -) +from ..utils import int_or_none, js_to_json, parse_duration +from .common import InfoExtractor class NTVDeIE(InfoExtractor): diff --git a/youtube_dl/extractor/ntvru.py b/youtube_dl/extractor/ntvru.py index 4f9cedb84..0fc8920e5 100644 --- a/youtube_dl/extractor/ntvru.py +++ b/youtube_dl/extractor/ntvru.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import clean_html, int_or_none, xpath_text from .common import InfoExtractor -from ..utils import ( - clean_html, - xpath_text, - int_or_none, -) class NTVRuIE(InfoExtractor): diff --git a/youtube_dl/extractor/nuevo.py b/youtube_dl/extractor/nuevo.py index 87fb94d1f..d1009c90a 100644 --- a/youtube_dl/extractor/nuevo.py +++ b/youtube_dl/extractor/nuevo.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import float_or_none, xpath_text from .common import InfoExtractor -from ..utils import ( - float_or_none, - xpath_text -) - class NuevoBaseIE(InfoExtractor): def _extract_nuevo(self, config_url, video_id): diff --git a/youtube_dl/extractor/nuvid.py b/youtube_dl/extractor/nuvid.py index ab6bfcd7f..dd36079b1 100644 --- a/youtube_dl/extractor/nuvid.py +++ b/youtube_dl/extractor/nuvid.py @@ -2,10 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_duration from .common import InfoExtractor -from ..utils import ( - parse_duration, -) class NuvidIE(InfoExtractor): diff --git a/youtube_dl/extractor/nytimes.py b/youtube_dl/extractor/nytimes.py index 2bb77ab24..cc542e306 100644 --- a/youtube_dl/extractor/nytimes.py +++ b/youtube_dl/extractor/nytimes.py @@ -1,11 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -import hmac -import hashlib import base64 +import hashlib +import hmac -from .common import InfoExtractor from ..utils import ( determine_ext, float_or_none, @@ -15,6 +14,7 @@ from ..utils import ( parse_iso8601, remove_start, ) +from .common import InfoExtractor class NYTimesBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/nzz.py b/youtube_dl/extractor/nzz.py index 2d352f53f..6be9609a7 100644 --- a/youtube_dl/extractor/nzz.py +++ b/youtube_dl/extractor/nzz.py @@ -3,10 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import extract_attributes from .common import InfoExtractor -from ..utils import ( - extract_attributes, -) class NZZIE(InfoExtractor): diff --git a/youtube_dl/extractor/odatv.py b/youtube_dl/extractor/odatv.py index 314527f98..bc02cd530 100644 --- a/youtube_dl/extractor/odatv.py +++ b/youtube_dl/extractor/odatv.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import NO_DEFAULT, ExtractorError, remove_start from .common import InfoExtractor -from ..utils import ( - ExtractorError, - NO_DEFAULT, - remove_start -) class OdaTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dl/extractor/odnoklassniki.py index 986708e75..9dd5f51e9 100644 --- a/youtube_dl/extractor/odnoklassniki.py +++ b/youtube_dl/extractor/odnoklassniki.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import ( compat_parse_qs, compat_urllib_parse_unquote, @@ -9,11 +8,12 @@ from ..compat import ( ) from ..utils import ( ExtractorError, - unified_strdate, int_or_none, qualities, unescapeHTML, + unified_strdate, ) +from .common import InfoExtractor class OdnoklassnikiIE(InfoExtractor): diff --git a/youtube_dl/extractor/ondemandkorea.py b/youtube_dl/extractor/ondemandkorea.py index de1d6b08a..c6c8f94e5 100644 --- a/youtube_dl/extractor/ondemandkorea.py +++ b/youtube_dl/extractor/ondemandkorea.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, js_to_json from .jwplatform import JWPlatformBaseIE -from ..utils import ( - ExtractorError, - js_to_json, -) class OnDemandKoreaIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/onet.py b/youtube_dl/extractor/onet.py index 0a501b3e5..1e42c036d 100644 --- a/youtube_dl/extractor/onet.py +++ b/youtube_dl/extractor/onet.py @@ -3,10 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, get_element_by_class, int_or_none, @@ -16,6 +15,7 @@ from ..utils import ( strip_or_none, url_basename, ) +from .common import InfoExtractor class OnetBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/onionstudios.py b/youtube_dl/extractor/onionstudios.py index 1d336cf30..88aa89114 100644 --- a/youtube_dl/extractor/onionstudios.py +++ b/youtube_dl/extractor/onionstudios.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, float_or_none, int_or_none, mimetype2ext from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - float_or_none, - mimetype2ext, -) class OnionStudiosIE(InfoExtractor): diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py index 84be2b1e3..7331fb4b9 100644 --- a/youtube_dl/extractor/ooyala.py +++ b/youtube_dl/extractor/ooyala.py @@ -1,16 +1,17 @@ from __future__ import unicode_literals -import re -import base64 -from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - ExtractorError, - unsmuggle_url, - determine_ext, -) +import base64 +import re + from ..compat import compat_urllib_parse_urlencode +from ..utils import ( + ExtractorError, + determine_ext, + float_or_none, + int_or_none, + unsmuggle_url, +) +from .common import InfoExtractor class OoyalaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index 32289d897..a50f84446 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_chr -from ..utils import ( - determine_ext, - ExtractorError, -) +from ..utils import ExtractorError, determine_ext +from .common import InfoExtractor class OpenloadIE(InfoExtractor): diff --git a/youtube_dl/extractor/ora.py b/youtube_dl/extractor/ora.py index 1d42be39b..994b1c51c 100644 --- a/youtube_dl/extractor/ora.py +++ b/youtube_dl/extractor/ora.py @@ -2,13 +2,10 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor + from ..compat import compat_urlparse -from ..utils import ( - get_element_by_attribute, - qualities, - unescapeHTML, -) +from ..utils import get_element_by_attribute, qualities, unescapeHTML +from .common import InfoExtractor class OraTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py index 1e2c54e68..fa0e5a68c 100644 --- a/youtube_dl/extractor/orf.py +++ b/youtube_dl/extractor/orf.py @@ -1,22 +1,22 @@ # coding: utf-8 from __future__ import unicode_literals -import re import calendar import datetime +import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( HEADRequest, - unified_strdate, - strip_jsonp, - int_or_none, - float_or_none, determine_ext, + float_or_none, + int_or_none, remove_end, + strip_jsonp, unescapeHTML, + unified_strdate, ) +from .common import InfoExtractor class ORFTVthekIE(InfoExtractor): diff --git a/youtube_dl/extractor/pandatv.py b/youtube_dl/extractor/pandatv.py index 133cc9b88..60b4b7dc7 100644 --- a/youtube_dl/extractor/pandatv.py +++ b/youtube_dl/extractor/pandatv.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, qualities from .common import InfoExtractor -from ..utils import ( - ExtractorError, - qualities, -) class PandaTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/pandoratv.py b/youtube_dl/extractor/pandoratv.py index 89c95fffb..e8f135446 100644 --- a/youtube_dl/extractor/pandoratv.py +++ b/youtube_dl/extractor/pandoratv.py @@ -1,11 +1,7 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, float_or_none, @@ -13,6 +9,7 @@ from ..utils import ( str_to_int, urlencode_postdata, ) +from .common import InfoExtractor class PandoraTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/patreon.py b/youtube_dl/extractor/patreon.py index a6a2c273f..a082d9dc7 100644 --- a/youtube_dl/extractor/patreon.py +++ b/youtube_dl/extractor/patreon.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import js_to_json +from .common import InfoExtractor class PatreonIE(InfoExtractor): diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py index 6baed773f..37876a71d 100644 --- a/youtube_dl/extractor/pbs.py +++ b/youtube_dl/extractor/pbs.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( + US_RATINGS, ExtractorError, determine_ext, int_or_none, @@ -12,8 +12,8 @@ from ..utils import ( strip_jsonp, strip_or_none, unified_strdate, - US_RATINGS, ) +from .common import InfoExtractor class PBSIE(InfoExtractor): diff --git a/youtube_dl/extractor/periscope.py b/youtube_dl/extractor/periscope.py index 0e3623024..309b981d4 100644 --- a/youtube_dl/extractor/periscope.py +++ b/youtube_dl/extractor/periscope.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_iso8601, unescapeHTML from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - unescapeHTML, -) class PeriscopeBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/philharmoniedeparis.py b/youtube_dl/extractor/philharmoniedeparis.py index f1008ae51..119425ed7 100644 --- a/youtube_dl/extractor/philharmoniedeparis.py +++ b/youtube_dl/extractor/philharmoniedeparis.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import float_or_none, int_or_none, parse_iso8601, xpath_text from .common import InfoExtractor -from ..utils import ( - float_or_none, - int_or_none, - parse_iso8601, - xpath_text, -) class PhilharmonieDeParisIE(InfoExtractor): diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dl/extractor/photobucket.py index 6c8bbe1d9..008d3be8e 100644 --- a/youtube_dl/extractor/photobucket.py +++ b/youtube_dl/extractor/photobucket.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class PhotobucketIE(InfoExtractor): diff --git a/youtube_dl/extractor/piksel.py b/youtube_dl/extractor/piksel.py index d44edcdfb..10b29a620 100644 --- a/youtube_dl/extractor/piksel.py +++ b/youtube_dl/extractor/piksel.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( ExtractorError, dict_get, int_or_none, - unescapeHTML, parse_iso8601, + unescapeHTML, ) +from .common import InfoExtractor class PikselIE(InfoExtractor): diff --git a/youtube_dl/extractor/pinkbike.py b/youtube_dl/extractor/pinkbike.py index 6a4580d54..d4ee4dca3 100644 --- a/youtube_dl/extractor/pinkbike.py +++ b/youtube_dl/extractor/pinkbike.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( int_or_none, remove_end, @@ -11,6 +10,7 @@ from ..utils import ( str_to_int, unified_strdate, ) +from .common import InfoExtractor class PinkbikeIE(InfoExtractor): diff --git a/youtube_dl/extractor/pladform.py b/youtube_dl/extractor/pladform.py index e38c7618e..51c9447cc 100644 --- a/youtube_dl/extractor/pladform.py +++ b/youtube_dl/extractor/pladform.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, qualities, xpath_text from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - xpath_text, - qualities, -) class PladformIE(InfoExtractor): diff --git a/youtube_dl/extractor/playfm.py b/youtube_dl/extractor/playfm.py index e766ccca3..6abb4eb86 100644 --- a/youtube_dl/extractor/playfm.py +++ b/youtube_dl/extractor/playfm.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) +from ..utils import ExtractorError, int_or_none, parse_iso8601 +from .common import InfoExtractor class PlayFMIE(InfoExtractor): diff --git a/youtube_dl/extractor/plays.py b/youtube_dl/extractor/plays.py index ddfc6f148..aa5746bbc 100644 --- a/youtube_dl/extractor/plays.py +++ b/youtube_dl/extractor/plays.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class PlaysTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/playtvak.py b/youtube_dl/extractor/playtvak.py index 391e1bd09..2e5040a76 100644 --- a/youtube_dl/extractor/playtvak.py +++ b/youtube_dl/extractor/playtvak.py @@ -1,17 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_urllib_parse_urlencode, compat_urlparse +from ..utils import ExtractorError, int_or_none, parse_iso8601, qualities from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_urllib_parse_urlencode, -) -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, - qualities, -) class PlaytvakIE(InfoExtractor): diff --git a/youtube_dl/extractor/playvid.py b/youtube_dl/extractor/playvid.py index 4aef186ea..3043de74d 100644 --- a/youtube_dl/extractor/playvid.py +++ b/youtube_dl/extractor/playvid.py @@ -2,15 +2,12 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import ( compat_urllib_parse_unquote, compat_urllib_parse_unquote_plus, ) -from ..utils import ( - clean_html, - ExtractorError, -) +from ..utils import ExtractorError, clean_html +from .common import InfoExtractor class PlayvidIE(InfoExtractor): diff --git a/youtube_dl/extractor/playwire.py b/youtube_dl/extractor/playwire.py index 4d96a10a7..ec943d289 100644 --- a/youtube_dl/extractor/playwire.py +++ b/youtube_dl/extractor/playwire.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import dict_get, float_or_none from .common import InfoExtractor -from ..utils import ( - dict_get, - float_or_none, -) class PlaywireIE(InfoExtractor): diff --git a/youtube_dl/extractor/pluralsight.py b/youtube_dl/extractor/pluralsight.py index 5c798e874..6e2a4f8ef 100644 --- a/youtube_dl/extractor/pluralsight.py +++ b/youtube_dl/extractor/pluralsight.py @@ -5,14 +5,10 @@ import json import os import random -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - dict_get, ExtractorError, + dict_get, float_or_none, int_or_none, parse_duration, @@ -20,6 +16,7 @@ from ..utils import ( srt_subtitles_timecode, urlencode_postdata, ) +from .common import InfoExtractor class PluralsightBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/podomatic.py b/youtube_dl/extractor/podomatic.py index f20946a2b..fc729e0ca 100644 --- a/youtube_dl/extractor/podomatic.py +++ b/youtube_dl/extractor/podomatic.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class PodomaticIE(InfoExtractor): diff --git a/youtube_dl/extractor/pokemon.py b/youtube_dl/extractor/pokemon.py index 2d87e7e70..ee2cfcc89 100644 --- a/youtube_dl/extractor/pokemon.py +++ b/youtube_dl/extractor/pokemon.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import extract_attributes, int_or_none from .common import InfoExtractor -from ..utils import ( - extract_attributes, - int_or_none, -) class PokemonIE(InfoExtractor): diff --git a/youtube_dl/extractor/polskieradio.py b/youtube_dl/extractor/polskieradio.py index 2ac1fcb0b..4f37a35b6 100644 --- a/youtube_dl/extractor/polskieradio.py +++ b/youtube_dl/extractor/polskieradio.py @@ -4,18 +4,14 @@ from __future__ import unicode_literals import itertools import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, - compat_urlparse -) +from ..compat import compat_str, compat_urllib_parse_unquote, compat_urlparse from ..utils import ( extract_attributes, int_or_none, strip_or_none, unified_timestamp, ) +from .common import InfoExtractor class PolskieRadioIE(InfoExtractor): diff --git a/youtube_dl/extractor/porn91.py b/youtube_dl/extractor/porn91.py index 073fc3e21..cfe15bc81 100644 --- a/youtube_dl/extractor/porn91.py +++ b/youtube_dl/extractor/porn91.py @@ -1,16 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from ..compat import ( - compat_urllib_parse_unquote, - compat_urllib_parse_urlencode, -) +from ..compat import compat_urllib_parse_unquote, compat_urllib_parse_urlencode +from ..utils import ExtractorError, int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, - ExtractorError, -) class Porn91IE(InfoExtractor): diff --git a/youtube_dl/extractor/porncom.py b/youtube_dl/extractor/porncom.py index 8218c7d3b..99fc87c87 100644 --- a/youtube_dl/extractor/porncom.py +++ b/youtube_dl/extractor/porncom.py @@ -2,14 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - parse_filesize, - str_to_int, -) +from ..utils import int_or_none, js_to_json, parse_filesize, str_to_int +from .common import InfoExtractor class PornComIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornflip.py b/youtube_dl/extractor/pornflip.py index a4a5d390e..120716e6f 100644 --- a/youtube_dl/extractor/pornflip.py +++ b/youtube_dl/extractor/pornflip.py @@ -1,16 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_parse_qs, compat_str +from ..utils import int_or_none, try_get, unified_timestamp from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_str, -) -from ..utils import ( - int_or_none, - try_get, - unified_timestamp, -) class PornFlipIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dl/extractor/pornhd.py index 842317e6c..a38b42ef4 100644 --- a/youtube_dl/extractor/pornhd.py +++ b/youtube_dl/extractor/pornhd.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, js_to_json from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - js_to_json, -) class PornHdIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index 3eaf56973..f074cf912 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -5,7 +5,7 @@ import itertools import os import re -from .common import InfoExtractor +from ..aes import aes_decrypt_text from ..compat import ( compat_HTTPError, compat_urllib_parse_unquote, @@ -20,9 +20,7 @@ from ..utils import ( sanitized_Request, str_to_int, ) -from ..aes import ( - aes_decrypt_text -) +from .common import InfoExtractor class PornHubIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornotube.py b/youtube_dl/extractor/pornotube.py index 1b5b9a320..3c10d86a2 100644 --- a/youtube_dl/extractor/pornotube.py +++ b/youtube_dl/extractor/pornotube.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import json -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class PornotubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornovoisines.py b/youtube_dl/extractor/pornovoisines.py index b6b71069d..cae130a7f 100644 --- a/youtube_dl/extractor/pornovoisines.py +++ b/youtube_dl/extractor/pornovoisines.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import float_or_none, int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - unified_strdate, -) class PornoVoisinesIE(InfoExtractor): diff --git a/youtube_dl/extractor/pornoxo.py b/youtube_dl/extractor/pornoxo.py index 1a0cce7e0..6a8d70aa1 100644 --- a/youtube_dl/extractor/pornoxo.py +++ b/youtube_dl/extractor/pornoxo.py @@ -2,10 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import str_to_int from .jwplatform import JWPlatformBaseIE -from ..utils import ( - str_to_int, -) class PornoXOIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/presstv.py b/youtube_dl/extractor/presstv.py index b5c279203..dcb3a3db9 100644 --- a/youtube_dl/extractor/presstv.py +++ b/youtube_dl/extractor/presstv.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import remove_start +from .common import InfoExtractor class PressTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/primesharetv.py b/youtube_dl/extractor/primesharetv.py index 0c1024772..0de3e7022 100644 --- a/youtube_dl/extractor/primesharetv.py +++ b/youtube_dl/extractor/primesharetv.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals +from ..utils import ExtractorError, sanitized_Request, urlencode_postdata from .common import InfoExtractor -from ..utils import ( - ExtractorError, - sanitized_Request, - urlencode_postdata, -) class PrimeShareTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/promptfile.py b/youtube_dl/extractor/promptfile.py index 23ac93d7e..2d55c1a37 100644 --- a/youtube_dl/extractor/promptfile.py +++ b/youtube_dl/extractor/promptfile.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, determine_ext, urlencode_postdata from .common import InfoExtractor -from ..utils import ( - determine_ext, - ExtractorError, - urlencode_postdata, -) class PromptFileIE(InfoExtractor): diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 03e1b1f7f..d121d416e 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -2,9 +2,8 @@ from __future__ import unicode_literals import re - from hashlib import sha1 -from .common import InfoExtractor + from ..compat import compat_str from ..utils import ( ExtractorError, @@ -13,6 +12,7 @@ from ..utils import ( int_or_none, unified_strdate, ) +from .common import InfoExtractor class ProSiebenSat1BaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/puls4.py b/youtube_dl/extractor/puls4.py index 80091b85f..9ef4333b1 100644 --- a/youtube_dl/extractor/puls4.py +++ b/youtube_dl/extractor/puls4.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import compat_str, parse_duration, unified_strdate from .prosiebensat1 import ProSiebenSat1BaseIE -from ..utils import ( - unified_strdate, - parse_duration, - compat_str, -) class Puls4IE(ProSiebenSat1BaseIE): diff --git a/youtube_dl/extractor/pyvideo.py b/youtube_dl/extractor/pyvideo.py index b8ac93a62..977323ef4 100644 --- a/youtube_dl/extractor/pyvideo.py +++ b/youtube_dl/extractor/pyvideo.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import int_or_none +from .common import InfoExtractor class PyvideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/qqmusic.py b/youtube_dl/extractor/qqmusic.py index 17c27da46..fe703f5cd 100644 --- a/youtube_dl/extractor/qqmusic.py +++ b/youtube_dl/extractor/qqmusic.py @@ -2,17 +2,17 @@ from __future__ import unicode_literals import random -import time import re +import time -from .common import InfoExtractor from ..utils import ( + ExtractorError, + clean_html, sanitized_Request, strip_jsonp, unescapeHTML, - clean_html, - ExtractorError, ) +from .common import InfoExtractor class QQMusicIE(InfoExtractor): diff --git a/youtube_dl/extractor/r7.py b/youtube_dl/extractor/r7.py index ed38c77eb..d7e7b1397 100644 --- a/youtube_dl/extractor/r7.py +++ b/youtube_dl/extractor/r7.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class R7IE(InfoExtractor): diff --git a/youtube_dl/extractor/radiobremen.py b/youtube_dl/extractor/radiobremen.py index 2c35f9845..c8a26a7d3 100644 --- a/youtube_dl/extractor/radiobremen.py +++ b/youtube_dl/extractor/radiobremen.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import parse_duration +from .common import InfoExtractor class RadioBremenIE(InfoExtractor): diff --git a/youtube_dl/extractor/radiocanada.py b/youtube_dl/extractor/radiocanada.py index 321917ad0..0c531569c 100644 --- a/youtube_dl/extractor/radiocanada.py +++ b/youtube_dl/extractor/radiocanada.py @@ -3,18 +3,18 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - xpath_text, - find_xpath_attr, + ExtractorError, determine_ext, + determine_protocol, + find_xpath_attr, int_or_none, unified_strdate, - xpath_element, - ExtractorError, - determine_protocol, unsmuggle_url, + xpath_element, + xpath_text, ) +from .common import InfoExtractor class RadioCanadaIE(InfoExtractor): diff --git a/youtube_dl/extractor/radiojavan.py b/youtube_dl/extractor/radiojavan.py index a53ad97a5..d043b1743 100644 --- a/youtube_dl/extractor/radiojavan.py +++ b/youtube_dl/extractor/radiojavan.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import str_to_int, unified_strdate from .common import InfoExtractor -from ..utils import ( - unified_strdate, - str_to_int, -) class RadioJavanIE(InfoExtractor): diff --git a/youtube_dl/extractor/rai.py b/youtube_dl/extractor/rai.py index 41afbd9af..953abdd60 100644 --- a/youtube_dl/extractor/rai.py +++ b/youtube_dl/extractor/rai.py @@ -1,10 +1,9 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, find_xpath_attr, fix_xml_ampersands, int_or_none, @@ -13,6 +12,7 @@ from ..utils import ( update_url_query, xpath_text, ) +from .common import InfoExtractor class RaiBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dl/extractor/rbmaradio.py index 53b82fba3..048a04c68 100644 --- a/youtube_dl/extractor/rbmaradio.py +++ b/youtube_dl/extractor/rbmaradio.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( clean_html, @@ -10,6 +9,7 @@ from ..utils import ( unified_timestamp, update_url_query, ) +from .common import InfoExtractor class RBMARadioIE(InfoExtractor): diff --git a/youtube_dl/extractor/rds.py b/youtube_dl/extractor/rds.py index bf200ea4d..ba8c521ba 100644 --- a/youtube_dl/extractor/rds.py +++ b/youtube_dl/extractor/rds.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_iso8601, - js_to_json, -) from ..compat import compat_str +from ..utils import js_to_json, parse_duration, parse_iso8601 +from .common import InfoExtractor class RDSIE(InfoExtractor): diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index c367a6ae7..1719d3a01 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, str_to_int, unified_strdate from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - str_to_int, - unified_strdate, -) class RedTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/regiotv.py b/youtube_dl/extractor/regiotv.py index e250a52f0..8da7ccecf 100644 --- a/youtube_dl/extractor/regiotv.py +++ b/youtube_dl/extractor/regiotv.py @@ -1,14 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import sanitized_Request, xpath_text, xpath_with_ns from .common import InfoExtractor -from ..utils import ( - sanitized_Request, - xpath_text, - xpath_with_ns, -) - class RegioTVIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?regio-tv\.de/video/(?P[0-9]+)' diff --git a/youtube_dl/extractor/rentv.py b/youtube_dl/extractor/rentv.py index 422c02cff..aa19d8b0c 100644 --- a/youtube_dl/extractor/rentv.py +++ b/youtube_dl/extractor/rentv.py @@ -1,9 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_str from .common import InfoExtractor from .jwplatform import JWPlatformBaseIE -from ..compat import compat_str class RENTVIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/reuters.py b/youtube_dl/extractor/reuters.py index 9dc482d21..f1b9221b4 100644 --- a/youtube_dl/extractor/reuters.py +++ b/youtube_dl/extractor/reuters.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, js_to_json, unescapeHTML from .common import InfoExtractor -from ..utils import ( - js_to_json, - int_or_none, - unescapeHTML, -) class ReutersIE(InfoExtractor): diff --git a/youtube_dl/extractor/reverbnation.py b/youtube_dl/extractor/reverbnation.py index 4cb99c244..c8f600201 100644 --- a/youtube_dl/extractor/reverbnation.py +++ b/youtube_dl/extractor/reverbnation.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import qualities, str_or_none from .common import InfoExtractor -from ..utils import ( - qualities, - str_or_none, -) class ReverbNationIE(InfoExtractor): diff --git a/youtube_dl/extractor/revision3.py b/youtube_dl/extractor/revision3.py index 833d8a2f0..2b8c1c8ab 100644 --- a/youtube_dl/extractor/revision3.py +++ b/youtube_dl/extractor/revision3.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_iso8601, - unescapeHTML, - qualities, -) +from ..utils import int_or_none, parse_iso8601, qualities, unescapeHTML +from .common import InfoExtractor class Revision3EmbedIE(InfoExtractor): diff --git a/youtube_dl/extractor/rice.py b/youtube_dl/extractor/rice.py index f855719ac..5c5b404ab 100644 --- a/youtube_dl/extractor/rice.py +++ b/youtube_dl/extractor/rice.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_parse_qs from ..utils import ( - xpath_text, - xpath_element, + ExtractorError, int_or_none, parse_iso8601, - ExtractorError, + xpath_element, + xpath_text, ) +from .common import InfoExtractor class RICEIE(InfoExtractor): diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index 2340dae53..e4886f989 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -1,12 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor +from ..compat import compat_parse_qs, compat_urlparse from .brightcove import BrightcoveLegacyIE -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from .common import InfoExtractor class RMCDecouverteIE(InfoExtractor): diff --git a/youtube_dl/extractor/ro220.py b/youtube_dl/extractor/ro220.py index 69934ef2b..fb049e797 100644 --- a/youtube_dl/extractor/ro220.py +++ b/youtube_dl/extractor/ro220.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class Ro220IE(InfoExtractor): diff --git a/youtube_dl/extractor/rockstargames.py b/youtube_dl/extractor/rockstargames.py index cd6904bc9..b4ea1818d 100644 --- a/youtube_dl/extractor/rockstargames.py +++ b/youtube_dl/extractor/rockstargames.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class RockstarGamesIE(InfoExtractor): diff --git a/youtube_dl/extractor/roosterteeth.py b/youtube_dl/extractor/roosterteeth.py index 46dfc78f5..7503656af 100644 --- a/youtube_dl/extractor/roosterteeth.py +++ b/youtube_dl/extractor/roosterteeth.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, @@ -11,6 +10,7 @@ from ..utils import ( unescapeHTML, urlencode_postdata, ) +from .common import InfoExtractor class RoosterTeethIE(InfoExtractor): diff --git a/youtube_dl/extractor/roxwel.py b/youtube_dl/extractor/roxwel.py index 65284643b..84f6654bf 100644 --- a/youtube_dl/extractor/roxwel.py +++ b/youtube_dl/extractor/roxwel.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, unified_strdate from .common import InfoExtractor -from ..utils import unified_strdate, determine_ext class RoxwelIE(InfoExtractor): diff --git a/youtube_dl/extractor/rozhlas.py b/youtube_dl/extractor/rozhlas.py index f8eda8dea..04d759c0b 100644 --- a/youtube_dl/extractor/rozhlas.py +++ b/youtube_dl/extractor/rozhlas.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, remove_start from .common import InfoExtractor -from ..utils import ( - int_or_none, - remove_start, -) class RozhlasIE(InfoExtractor): diff --git a/youtube_dl/extractor/rtbf.py b/youtube_dl/extractor/rtbf.py index 28cc5522d..05652a97b 100644 --- a/youtube_dl/extractor/rtbf.py +++ b/youtube_dl/extractor/rtbf.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..utils import ( - int_or_none, - ExtractorError, -) class RTBFIE(InfoExtractor): diff --git a/youtube_dl/extractor/rte.py b/youtube_dl/extractor/rte.py index a6fac6c35..aeae1e370 100644 --- a/youtube_dl/extractor/rte.py +++ b/youtube_dl/extractor/rte.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - float_or_none, - parse_iso8601, - unescapeHTML, - ExtractorError, -) +from ..utils import ExtractorError, float_or_none, parse_iso8601, unescapeHTML +from .common import InfoExtractor class RteBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/rtl2.py b/youtube_dl/extractor/rtl2.py index 721ee733c..f4f69dbc4 100644 --- a/youtube_dl/extractor/rtl2.py +++ b/youtube_dl/extractor/rtl2.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class RTL2IE(InfoExtractor): diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index 54076de28..9965e8475 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_duration, -) class RtlNlIE(InfoExtractor): diff --git a/youtube_dl/extractor/rts.py b/youtube_dl/extractor/rts.py index 48f17b828..c61c60387 100644 --- a/youtube_dl/extractor/rts.py +++ b/youtube_dl/extractor/rts.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .srgssr import SRGSSRIE from ..compat import compat_str from ..utils import ( + determine_ext, int_or_none, parse_duration, parse_iso8601, unescapeHTML, - determine_ext, ) +from .srgssr import SRGSSRIE class RTSIE(SRGSSRIE): diff --git a/youtube_dl/extractor/rtve.py b/youtube_dl/extractor/rtve.py index 746677a24..da1b65e5b 100644 --- a/youtube_dl/extractor/rtve.py +++ b/youtube_dl/extractor/rtve.py @@ -5,10 +5,7 @@ import base64 import re import time -from .common import InfoExtractor -from ..compat import ( - compat_struct_unpack, -) +from ..compat import compat_struct_unpack from ..utils import ( ExtractorError, float_or_none, @@ -17,6 +14,7 @@ from ..utils import ( sanitized_Request, std_headers, ) +from .common import InfoExtractor def _decrypt_url(png): diff --git a/youtube_dl/extractor/rtvnh.py b/youtube_dl/extractor/rtvnh.py index 6a00f7007..96544533c 100644 --- a/youtube_dl/extractor/rtvnh.py +++ b/youtube_dl/extractor/rtvnh.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class RTVNHIE(InfoExtractor): diff --git a/youtube_dl/extractor/rudo.py b/youtube_dl/extractor/rudo.py index 3bfe934d8..dd4e9df0f 100644 --- a/youtube_dl/extractor/rudo.py +++ b/youtube_dl/extractor/rudo.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import get_element_by_class, js_to_json, unified_strdate from .jwplatform import JWPlatformBaseIE -from ..utils import ( - js_to_json, - get_element_by_class, - unified_strdate, -) class RudoIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/rutube.py b/youtube_dl/extractor/rutube.py index fd1df925b..547c6d2b7 100644 --- a/youtube_dl/extractor/rutube.py +++ b/youtube_dl/extractor/rutube.py @@ -1,17 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re +from ..compat import compat_str +from ..utils import determine_ext, unified_strdate from .common import InfoExtractor -from ..compat import ( - compat_str, -) -from ..utils import ( - determine_ext, - unified_strdate, -) class RutubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/rutv.py b/youtube_dl/extractor/rutv.py index a5e672c0a..7da9272f0 100644 --- a/youtube_dl/extractor/rutv.py +++ b/youtube_dl/extractor/rutv.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none -) class RUTVIE(InfoExtractor): diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dl/extractor/ruutu.py index f12bc5614..a3bc21b12 100644 --- a/youtube_dl/extractor/ruutu.py +++ b/youtube_dl/extractor/ruutu.py @@ -1,15 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, xpath_attr, xpath_text, ) +from .common import InfoExtractor class RuutuIE(InfoExtractor): diff --git a/youtube_dl/extractor/safari.py b/youtube_dl/extractor/safari.py index c3aec1edd..18d840425 100644 --- a/youtube_dl/extractor/safari.py +++ b/youtube_dl/extractor/safari.py @@ -3,15 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor - from ..utils import ( ExtractorError, sanitized_Request, std_headers, - urlencode_postdata, update_url_query, + urlencode_postdata, ) +from .common import InfoExtractor class SafariBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/sandia.py b/youtube_dl/extractor/sandia.py index 96e43af84..2ff8f0648 100644 --- a/youtube_dl/extractor/sandia.py +++ b/youtube_dl/extractor/sandia.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import int_or_none, mimetype2ext from .common import InfoExtractor -from ..utils import ( - int_or_none, - mimetype2ext, -) class SandiaIE(InfoExtractor): diff --git a/youtube_dl/extractor/sapo.py b/youtube_dl/extractor/sapo.py index 49a9b313a..1a8a64ec5 100644 --- a/youtube_dl/extractor/sapo.py +++ b/youtube_dl/extractor/sapo.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_duration, unified_strdate from .common import InfoExtractor -from ..utils import ( - parse_duration, - unified_strdate, -) class SapoIE(InfoExtractor): diff --git a/youtube_dl/extractor/sbs.py b/youtube_dl/extractor/sbs.py index 845712a76..885518aad 100644 --- a/youtube_dl/extractor/sbs.py +++ b/youtube_dl/extractor/sbs.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, smuggle_url from .common import InfoExtractor -from ..utils import ( - smuggle_url, - ExtractorError, -) class SBSIE(InfoExtractor): diff --git a/youtube_dl/extractor/scivee.py b/youtube_dl/extractor/scivee.py index b1ca12fde..497ee555f 100644 --- a/youtube_dl/extractor/scivee.py +++ b/youtube_dl/extractor/scivee.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class SciVeeIE(InfoExtractor): diff --git a/youtube_dl/extractor/screencast.py b/youtube_dl/extractor/screencast.py index 62a6a8337..9fdf454a6 100644 --- a/youtube_dl/extractor/screencast.py +++ b/youtube_dl/extractor/screencast.py @@ -1,14 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_parse_qs, compat_urllib_request +from ..utils import ExtractorError from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urllib_request, -) -from ..utils import ( - ExtractorError, -) class ScreencastIE(InfoExtractor): diff --git a/youtube_dl/extractor/screencastomatic.py b/youtube_dl/extractor/screencastomatic.py index 94a2a37d2..aaf2e2454 100644 --- a/youtube_dl/extractor/screencastomatic.py +++ b/youtube_dl/extractor/screencastomatic.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .jwplatform import JWPlatformBaseIE from ..utils import js_to_json +from .jwplatform import JWPlatformBaseIE class ScreencastOMaticIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/senateisvp.py b/youtube_dl/extractor/senateisvp.py index 387a4f7f6..edfb49af9 100644 --- a/youtube_dl/extractor/senateisvp.py +++ b/youtube_dl/extractor/senateisvp.py @@ -2,15 +2,10 @@ from __future__ import unicode_literals import re + +from ..compat import compat_parse_qs, compat_urlparse +from ..utils import ExtractorError, unsmuggle_url from .common import InfoExtractor -from ..utils import ( - ExtractorError, - unsmuggle_url, -) -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) class SenateISVPIE(InfoExtractor): diff --git a/youtube_dl/extractor/sendtonews.py b/youtube_dl/extractor/sendtonews.py index 9880a5a78..3991f1b22 100644 --- a/youtube_dl/extractor/sendtonews.py +++ b/youtube_dl/extractor/sendtonews.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .jwplatform import JWPlatformBaseIE from ..utils import ( - float_or_none, - parse_iso8601, - update_url_query, - int_or_none, determine_protocol, + float_or_none, + int_or_none, + parse_iso8601, unescapeHTML, + update_url_query, ) +from .jwplatform import JWPlatformBaseIE class SendtoNewsIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/servingsys.py b/youtube_dl/extractor/servingsys.py index c013d678f..1278b7ebf 100644 --- a/youtube_dl/extractor/servingsys.py +++ b/youtube_dl/extractor/servingsys.py @@ -1,9 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none from .common import InfoExtractor -from ..utils import ( - int_or_none, -) class ServingSysIE(InfoExtractor): diff --git a/youtube_dl/extractor/shahid.py b/youtube_dl/extractor/shahid.py index 62d41e88a..c21ee847b 100644 --- a/youtube_dl/extractor/shahid.py +++ b/youtube_dl/extractor/shahid.py @@ -1,19 +1,19 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re -from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( ExtractorError, + clean_html, int_or_none, parse_iso8601, str_or_none, urlencode_postdata, - clean_html, ) +from .common import InfoExtractor class ShahidIE(InfoExtractor): diff --git a/youtube_dl/extractor/shared.py b/youtube_dl/extractor/shared.py index 89e19e927..e6a27b115 100644 --- a/youtube_dl/extractor/shared.py +++ b/youtube_dl/extractor/shared.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import base64 +from ..utils import ExtractorError, int_or_none, urlencode_postdata from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - urlencode_postdata, -) class SharedBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/showroomlive.py b/youtube_dl/extractor/showroomlive.py index efd9d561f..e356dbeb0 100644 --- a/youtube_dl/extractor/showroomlive.py +++ b/youtube_dl/extractor/showroomlive.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - urljoin, -) +from ..utils import ExtractorError, int_or_none, urljoin +from .common import InfoExtractor class ShowRoomLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/sina.py b/youtube_dl/extractor/sina.py index 8fc66732a..8bcc96b30 100644 --- a/youtube_dl/extractor/sina.py +++ b/youtube_dl/extractor/sina.py @@ -3,16 +3,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - HEADRequest, ExtractorError, - int_or_none, - update_url_query, - qualities, - get_element_by_attribute, + HEADRequest, clean_html, + get_element_by_attribute, + int_or_none, + qualities, + update_url_query, ) +from .common import InfoExtractor class SinaIE(InfoExtractor): diff --git a/youtube_dl/extractor/sixplay.py b/youtube_dl/extractor/sixplay.py index d3aba58a2..5b0be809e 100644 --- a/youtube_dl/extractor/sixplay.py +++ b/youtube_dl/extractor/sixplay.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, int_or_none, mimetype2ext, qualities from .common import InfoExtractor -from ..utils import ( - qualities, - int_or_none, - mimetype2ext, - determine_ext, -) class SixPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/skynewsarabia.py b/youtube_dl/extractor/skynewsarabia.py index fffc9aa22..c793c1454 100644 --- a/youtube_dl/extractor/skynewsarabia.py +++ b/youtube_dl/extractor/skynewsarabia.py @@ -1,12 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_iso8601, - parse_duration, -) +from ..utils import parse_duration, parse_iso8601 +from .common import InfoExtractor class SkyNewsArabiaBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/skysports.py b/youtube_dl/extractor/skysports.py index 4ca9f6b3c..3d500d367 100644 --- a/youtube_dl/extractor/skysports.py +++ b/youtube_dl/extractor/skysports.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import strip_or_none +from .common import InfoExtractor class SkySportsIE(InfoExtractor): diff --git a/youtube_dl/extractor/slideshare.py b/youtube_dl/extractor/slideshare.py index 74a1dc672..45235291a 100644 --- a/youtube_dl/extractor/slideshare.py +++ b/youtube_dl/extractor/slideshare.py @@ -1,16 +1,11 @@ from __future__ import unicode_literals -import re import json +import re +from ..compat import compat_urlparse +from ..utils import ExtractorError, get_element_by_id from .common import InfoExtractor -from ..compat import ( - compat_urlparse, -) -from ..utils import ( - ExtractorError, - get_element_by_id, -) class SlideshareIE(InfoExtractor): diff --git a/youtube_dl/extractor/smotri.py b/youtube_dl/extractor/smotri.py index 370fa8879..4bfd2d2be 100644 --- a/youtube_dl/extractor/smotri.py +++ b/youtube_dl/extractor/smotri.py @@ -1,12 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import json import hashlib +import json +import re import uuid -from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, @@ -15,6 +14,7 @@ from ..utils import ( urlencode_postdata, xpath_text, ) +from .common import InfoExtractor class SmotriIE(InfoExtractor): diff --git a/youtube_dl/extractor/snotr.py b/youtube_dl/extractor/snotr.py index f77354748..d8fbec4a5 100644 --- a/youtube_dl/extractor/snotr.py +++ b/youtube_dl/extractor/snotr.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_duration, parse_filesize, str_to_int from .common import InfoExtractor -from ..utils import ( - parse_duration, - parse_filesize, - str_to_int, -) class SnotrIE(InfoExtractor): diff --git a/youtube_dl/extractor/sohu.py b/youtube_dl/extractor/sohu.py index 30760ca06..1c48c3278 100644 --- a/youtube_dl/extractor/sohu.py +++ b/youtube_dl/extractor/sohu.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_urlencode, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ExtractorError +from .common import InfoExtractor class SohuIE(InfoExtractor): diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py index b3aa4ce26..fe3833640 100644 --- a/youtube_dl/extractor/soundcloud.py +++ b/youtube_dl/extractor/soundcloud.py @@ -1,23 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re -from .common import ( - InfoExtractor, - SearchInfoExtractor -) -from ..compat import ( - compat_str, - compat_urlparse, - compat_urllib_parse_urlencode, -) -from ..utils import ( - ExtractorError, - int_or_none, - unified_strdate, -) +from ..compat import compat_str, compat_urllib_parse_urlencode, compat_urlparse +from ..utils import ExtractorError, int_or_none, unified_strdate +from .common import InfoExtractor, SearchInfoExtractor class SoundcloudIE(InfoExtractor): diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 44d8fa52f..99665272d 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -2,17 +2,10 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_urllib_parse_urlparse, -) -from ..utils import ( - sanitized_Request, - str_to_int, - unified_strdate, -) from ..aes import aes_decrypt_text +from ..compat import compat_urllib_parse_unquote, compat_urllib_parse_urlparse +from ..utils import sanitized_Request, str_to_int, unified_strdate +from .common import InfoExtractor class SpankwireIE(InfoExtractor): diff --git a/youtube_dl/extractor/spiegel.py b/youtube_dl/extractor/spiegel.py index ec1b60388..82fc5f3cb 100644 --- a/youtube_dl/extractor/spiegel.py +++ b/youtube_dl/extractor/spiegel.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from .spiegeltv import SpiegeltvIE from ..compat import compat_urlparse from ..utils import ( extract_attributes, - unified_strdate, get_element_by_attribute, + unified_strdate, ) +from .common import InfoExtractor +from .spiegeltv import SpiegeltvIE class SpiegelIE(InfoExtractor): diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py index e1cfb8698..76e9c1063 100644 --- a/youtube_dl/extractor/spiegeltv.py +++ b/youtube_dl/extractor/spiegeltv.py @@ -1,12 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse -from ..utils import ( - determine_ext, - float_or_none, -) +from ..utils import determine_ext, float_or_none +from .common import InfoExtractor class SpiegeltvIE(InfoExtractor): diff --git a/youtube_dl/extractor/sport5.py b/youtube_dl/extractor/sport5.py index a417b5a4e..fecbd4482 100644 --- a/youtube_dl/extractor/sport5.py +++ b/youtube_dl/extractor/sport5.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class Sport5IE(InfoExtractor): diff --git a/youtube_dl/extractor/sportbox.py b/youtube_dl/extractor/sportbox.py index b512cd20f..409f85260 100644 --- a/youtube_dl/extractor/sportbox.py +++ b/youtube_dl/extractor/sportbox.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - js_to_json, - unified_strdate, -) +from ..utils import js_to_json, unified_strdate +from .common import InfoExtractor class SportBoxIE(InfoExtractor): diff --git a/youtube_dl/extractor/sportdeutschland.py b/youtube_dl/extractor/sportdeutschland.py index a3c35a899..ab7daf690 100644 --- a/youtube_dl/extractor/sportdeutschland.py +++ b/youtube_dl/extractor/sportdeutschland.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import parse_iso8601, sanitized_Request from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - sanitized_Request, -) class SportDeutschlandIE(InfoExtractor): diff --git a/youtube_dl/extractor/sportschau.py b/youtube_dl/extractor/sportschau.py index 0d7925a08..4d3280fbc 100644 --- a/youtube_dl/extractor/sportschau.py +++ b/youtube_dl/extractor/sportschau.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .wdr import WDRBaseIE from ..utils import get_element_by_attribute +from .wdr import WDRBaseIE class SportschauIE(WDRBaseIE): diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dl/extractor/srgssr.py index 319a48a7a..748cb60bc 100644 --- a/youtube_dl/extractor/srgssr.py +++ b/youtube_dl/extractor/srgssr.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_urlparse -from ..utils import ( - ExtractorError, - parse_iso8601, - qualities, -) +from ..utils import ExtractorError, parse_iso8601, qualities +from .common import InfoExtractor class SRGSSRIE(InfoExtractor): diff --git a/youtube_dl/extractor/srmediathek.py b/youtube_dl/extractor/srmediathek.py index 28baf901c..761e03d38 100644 --- a/youtube_dl/extractor/srmediathek.py +++ b/youtube_dl/extractor/srmediathek.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, get_element_by_attribute from .ard import ARDMediathekIE -from ..utils import ( - ExtractorError, - get_element_by_attribute, -) class SRMediathekIE(ARDMediathekIE): diff --git a/youtube_dl/extractor/stanfordoc.py b/youtube_dl/extractor/stanfordoc.py index cce65fb10..c15a4f7fa 100644 --- a/youtube_dl/extractor/stanfordoc.py +++ b/youtube_dl/extractor/stanfordoc.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, orderedSet, unescapeHTML from .common import InfoExtractor -from ..utils import ( - ExtractorError, - orderedSet, - unescapeHTML, -) class StanfordOpenClassroomIE(InfoExtractor): diff --git a/youtube_dl/extractor/steam.py b/youtube_dl/extractor/steam.py index 1a831ef6d..39c79cde8 100644 --- a/youtube_dl/extractor/steam.py +++ b/youtube_dl/extractor/steam.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, unescapeHTML from .common import InfoExtractor -from ..utils import ( - ExtractorError, - unescapeHTML, -) class SteamIE(InfoExtractor): diff --git a/youtube_dl/extractor/stitcher.py b/youtube_dl/extractor/stitcher.py index 97d1ff681..5d5ba8531 100644 --- a/youtube_dl/extractor/stitcher.py +++ b/youtube_dl/extractor/stitcher.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, int_or_none, js_to_json, unescapeHTML from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - js_to_json, - unescapeHTML, -) class StitcherIE(InfoExtractor): diff --git a/youtube_dl/extractor/streamable.py b/youtube_dl/extractor/streamable.py index e973c867c..4dbd61bbe 100644 --- a/youtube_dl/extractor/streamable.py +++ b/youtube_dl/extractor/streamable.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, float_or_none, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, -) class StreamableIE(InfoExtractor): diff --git a/youtube_dl/extractor/streamcloud.py b/youtube_dl/extractor/streamcloud.py index 6a6bb90c4..feba17908 100644 --- a/youtube_dl/extractor/streamcloud.py +++ b/youtube_dl/extractor/streamcloud.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, urlencode_postdata from .common import InfoExtractor -from ..utils import ( - ExtractorError, - urlencode_postdata, -) class StreamcloudIE(InfoExtractor): diff --git a/youtube_dl/extractor/streamcz.py b/youtube_dl/extractor/streamcz.py index 9e533103c..b2d4a9d7d 100644 --- a/youtube_dl/extractor/streamcz.py +++ b/youtube_dl/extractor/streamcz.py @@ -4,11 +4,8 @@ from __future__ import unicode_literals import hashlib import time +from ..utils import int_or_none, sanitized_Request from .common import InfoExtractor -from ..utils import ( - int_or_none, - sanitized_Request, -) def _get_api_key(api_path): diff --git a/youtube_dl/extractor/streetvoice.py b/youtube_dl/extractor/streetvoice.py index 91612c7f2..2d855cdd7 100644 --- a/youtube_dl/extractor/streetvoice.py +++ b/youtube_dl/extractor/streetvoice.py @@ -1,9 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str from ..utils import unified_strdate +from .common import InfoExtractor class StreetVoiceIE(InfoExtractor): diff --git a/youtube_dl/extractor/sunporno.py b/youtube_dl/extractor/sunporno.py index 68051169b..3b2682b82 100644 --- a/youtube_dl/extractor/sunporno.py +++ b/youtube_dl/extractor/sunporno.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, int_or_none, parse_duration, qualities from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, - qualities, - determine_ext, -) class SunPornoIE(InfoExtractor): diff --git a/youtube_dl/extractor/svt.py b/youtube_dl/extractor/svt.py index 10cf80885..97addbeb8 100644 --- a/youtube_dl/extractor/svt.py +++ b/youtube_dl/extractor/svt.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, dict_get, int_or_none, try_get from .common import InfoExtractor -from ..utils import ( - determine_ext, - dict_get, - int_or_none, - try_get, -) class SVTBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/swrmediathek.py b/youtube_dl/extractor/swrmediathek.py index 0f615979e..b27b942ba 100644 --- a/youtube_dl/extractor/swrmediathek.py +++ b/youtube_dl/extractor/swrmediathek.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_protocol, int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, - determine_protocol, -) class SWRMediathekIE(InfoExtractor): diff --git a/youtube_dl/extractor/syfy.py b/youtube_dl/extractor/syfy.py index def7e5a2c..0b7340ee3 100644 --- a/youtube_dl/extractor/syfy.py +++ b/youtube_dl/extractor/syfy.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import smuggle_url, update_url_query from .adobepass import AdobePassIE -from ..utils import ( - update_url_query, - smuggle_url, -) class SyfyIE(AdobePassIE): diff --git a/youtube_dl/extractor/tagesschau.py b/youtube_dl/extractor/tagesschau.py index c351b7545..2efd83446 100644 --- a/youtube_dl/extractor/tagesschau.py +++ b/youtube_dl/extractor/tagesschau.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, js_to_json, parse_filesize, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - determine_ext, - js_to_json, - parse_iso8601, - parse_filesize, -) class TagesschauPlayerIE(InfoExtractor): diff --git a/youtube_dl/extractor/tass.py b/youtube_dl/extractor/tass.py index 6d336da78..e8fb8c1fd 100644 --- a/youtube_dl/extractor/tass.py +++ b/youtube_dl/extractor/tass.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import js_to_json, qualities from .common import InfoExtractor -from ..utils import ( - js_to_json, - qualities, -) class TassIE(InfoExtractor): diff --git a/youtube_dl/extractor/tbs.py b/youtube_dl/extractor/tbs.py index bf93eb868..e3260b4cf 100644 --- a/youtube_dl/extractor/tbs.py +++ b/youtube_dl/extractor/tbs.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .turner import TurnerBaseIE from ..utils import extract_attributes +from .turner import TurnerBaseIE class TBSIE(TurnerBaseIE): diff --git a/youtube_dl/extractor/teachertube.py b/youtube_dl/extractor/teachertube.py index f14713a78..e8b23aa1c 100644 --- a/youtube_dl/extractor/teachertube.py +++ b/youtube_dl/extractor/teachertube.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, qualities from .common import InfoExtractor -from ..utils import ( - qualities, - determine_ext, -) class TeacherTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index 75346393b..ae4053c9a 100644 --- a/youtube_dl/extractor/teamcoco.py +++ b/youtube_dl/extractor/teamcoco.py @@ -3,16 +3,12 @@ from __future__ import unicode_literals import base64 import binascii -import re import json +import re -from .common import InfoExtractor -from ..utils import ( - ExtractorError, - qualities, - determine_ext, -) from ..compat import compat_ord +from ..utils import ExtractorError, determine_ext, qualities +from .common import InfoExtractor class TeamcocoIE(InfoExtractor): diff --git a/youtube_dl/extractor/teamfourstar.py b/youtube_dl/extractor/teamfourstar.py index a8c6ed7be..6ea73caac 100644 --- a/youtube_dl/extractor/teamfourstar.py +++ b/youtube_dl/extractor/teamfourstar.py @@ -1,9 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import unified_strdate from .common import InfoExtractor from .jwplatform import JWPlatformIE -from ..utils import unified_strdate class TeamFourStarIE(InfoExtractor): diff --git a/youtube_dl/extractor/techtalks.py b/youtube_dl/extractor/techtalks.py index a5b62c717..93aa8f2c7 100644 --- a/youtube_dl/extractor/techtalks.py +++ b/youtube_dl/extractor/techtalks.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import clean_html, get_element_by_attribute from .common import InfoExtractor -from ..utils import ( - get_element_by_attribute, - clean_html, -) class TechTalksIE(InfoExtractor): diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py index 1b1afab32..67d6eefdf 100644 --- a/youtube_dl/extractor/ted.py +++ b/youtube_dl/extractor/ted.py @@ -3,10 +3,9 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor - from ..compat import compat_str from ..utils import int_or_none +from .common import InfoExtractor class TEDIE(InfoExtractor): diff --git a/youtube_dl/extractor/tele13.py b/youtube_dl/extractor/tele13.py index a29a64b6d..bc1115062 100644 --- a/youtube_dl/extractor/tele13.py +++ b/youtube_dl/extractor/tele13.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, js_to_json, qualities from .common import InfoExtractor from .youtube import YoutubeIE -from ..utils import ( - js_to_json, - qualities, - determine_ext, -) class Tele13IE(InfoExtractor): diff --git a/youtube_dl/extractor/telegraaf.py b/youtube_dl/extractor/telegraaf.py index 0f576c1ab..9e939d030 100644 --- a/youtube_dl/extractor/telegraaf.py +++ b/youtube_dl/extractor/telegraaf.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, remove_end from .common import InfoExtractor -from ..utils import ( - determine_ext, - remove_end, -) class TelegraafIE(InfoExtractor): diff --git a/youtube_dl/extractor/telemb.py b/youtube_dl/extractor/telemb.py index 9bcac4ec0..566adf2c9 100644 --- a/youtube_dl/extractor/telemb.py +++ b/youtube_dl/extractor/telemb.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import remove_start +from .common import InfoExtractor class TeleMBIE(InfoExtractor): diff --git a/youtube_dl/extractor/telequebec.py b/youtube_dl/extractor/telequebec.py index 4043fcb92..8e4610ede 100644 --- a/youtube_dl/extractor/telequebec.py +++ b/youtube_dl/extractor/telequebec.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class TeleQuebecIE(InfoExtractor): diff --git a/youtube_dl/extractor/teletask.py b/youtube_dl/extractor/teletask.py index b9e2ef8ca..d9d2658be 100644 --- a/youtube_dl/extractor/teletask.py +++ b/youtube_dl/extractor/teletask.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class TeleTaskIE(InfoExtractor): diff --git a/youtube_dl/extractor/testurl.py b/youtube_dl/extractor/testurl.py index 46918adb0..abb8a5e5f 100644 --- a/youtube_dl/extractor/testurl.py +++ b/youtube_dl/extractor/testurl.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class TestURLIE(InfoExtractor): diff --git a/youtube_dl/extractor/tfo.py b/youtube_dl/extractor/tfo.py index 6f1eeac57..34ca3515d 100644 --- a/youtube_dl/extractor/tfo.py +++ b/youtube_dl/extractor/tfo.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import json +from ..utils import ExtractorError, HEADRequest, int_or_none from .common import InfoExtractor -from ..utils import ( - HEADRequest, - ExtractorError, - int_or_none, -) class TFOIE(InfoExtractor): diff --git a/youtube_dl/extractor/theintercept.py b/youtube_dl/extractor/theintercept.py index f23b58713..901ba65e7 100644 --- a/youtube_dl/extractor/theintercept.py +++ b/youtube_dl/extractor/theintercept.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - parse_iso8601, - int_or_none, - ExtractorError, -) +from ..utils import ExtractorError, int_or_none, parse_iso8601 +from .common import InfoExtractor class TheInterceptIE(InfoExtractor): diff --git a/youtube_dl/extractor/theplatform.py b/youtube_dl/extractor/theplatform.py index 192d8fa29..b136ae308 100644 --- a/youtube_dl/extractor/theplatform.py +++ b/youtube_dl/extractor/theplatform.py @@ -1,31 +1,28 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import time -import hmac import binascii import hashlib +import hmac +import re +import time - -from .once import OnceIE -from .adobepass import AdobePassIE -from ..compat import ( - compat_parse_qs, - compat_urllib_parse_urlparse, -) +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, + find_xpath_attr, float_or_none, int_or_none, + mimetype2ext, sanitized_Request, unsmuggle_url, update_url_query, xpath_with_ns, - mimetype2ext, - find_xpath_attr, ) +from .adobepass import AdobePassIE +from .once import OnceIE + default_ns = 'http://www.w3.org/2005/SMIL21/Language' _x = lambda p: xpath_with_ns(p, {'smil': default_ns}) diff --git a/youtube_dl/extractor/thescene.py b/youtube_dl/extractor/thescene.py index ce1326c03..31ccc9440 100644 --- a/youtube_dl/extractor/thescene.py +++ b/youtube_dl/extractor/thescene.py @@ -1,9 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor - from ..compat import compat_urlparse from ..utils import qualities +from .common import InfoExtractor class TheSceneIE(InfoExtractor): diff --git a/youtube_dl/extractor/thesixtyone.py b/youtube_dl/extractor/thesixtyone.py index d63aef5de..8f5a2205d 100644 --- a/youtube_dl/extractor/thesixtyone.py +++ b/youtube_dl/extractor/thesixtyone.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import unified_strdate +from .common import InfoExtractor class TheSixtyOneIE(InfoExtractor): diff --git a/youtube_dl/extractor/theweatherchannel.py b/youtube_dl/extractor/theweatherchannel.py index c34a49d03..e36fc7307 100644 --- a/youtube_dl/extractor/theweatherchannel.py +++ b/youtube_dl/extractor/theweatherchannel.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import determine_ext, parse_duration from .theplatform import ThePlatformIE -from ..utils import ( - determine_ext, - parse_duration, -) class TheWeatherChannelIE(ThePlatformIE): diff --git a/youtube_dl/extractor/thisav.py b/youtube_dl/extractor/thisav.py index 4473a3c77..67e94d911 100644 --- a/youtube_dl/extractor/thisav.py +++ b/youtube_dl/extractor/thisav.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .jwplatform import JWPlatformBaseIE from ..utils import remove_end +from .jwplatform import JWPlatformBaseIE class ThisAVIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/threeqsdn.py b/youtube_dl/extractor/threeqsdn.py index f26937da1..1d48bc3cc 100644 --- a/youtube_dl/extractor/threeqsdn.py +++ b/youtube_dl/extractor/threeqsdn.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, js_to_json, mimetype2ext from .common import InfoExtractor -from ..utils import ( - determine_ext, - js_to_json, - mimetype2ext, -) class ThreeQSDNIE(InfoExtractor): diff --git a/youtube_dl/extractor/tinypic.py b/youtube_dl/extractor/tinypic.py index bc2def508..328d56b4c 100644 --- a/youtube_dl/extractor/tinypic.py +++ b/youtube_dl/extractor/tinypic.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class TinyPicIE(InfoExtractor): diff --git a/youtube_dl/extractor/tlc.py b/youtube_dl/extractor/tlc.py index fd145ba42..4b4bddbcf 100644 --- a/youtube_dl/extractor/tlc.py +++ b/youtube_dl/extractor/tlc.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor +from ..compat import compat_parse_qs, compat_urlparse from .brightcove import BrightcoveLegacyIE -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) +from .common import InfoExtractor class TlcDeIE(InfoExtractor): diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py index 7e6ec3430..070880ee3 100644 --- a/youtube_dl/extractor/tnaflix.py +++ b/youtube_dl/extractor/tnaflix.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( fix_xml_ampersands, @@ -13,6 +12,7 @@ from ..utils import ( unescapeHTML, xpath_text, ) +from .common import InfoExtractor class TNAFlixNetworkBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py index c54b876d3..df33d0359 100644 --- a/youtube_dl/extractor/toggle.py +++ b/youtube_dl/extractor/toggle.py @@ -4,15 +4,15 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, float_or_none, int_or_none, parse_iso8601, sanitized_Request, ) +from .common import InfoExtractor class ToggleIE(InfoExtractor): diff --git a/youtube_dl/extractor/tonline.py b/youtube_dl/extractor/tonline.py index cc11eae2a..80abffc5a 100644 --- a/youtube_dl/extractor/tonline.py +++ b/youtube_dl/extractor/tonline.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class TOnlineIE(InfoExtractor): diff --git a/youtube_dl/extractor/toutv.py b/youtube_dl/extractor/toutv.py index 26d770992..d1d09ceb9 100644 --- a/youtube_dl/extractor/toutv.py +++ b/youtube_dl/extractor/toutv.py @@ -1,15 +1,15 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( + ExtractorError, + extract_attributes, int_or_none, js_to_json, - ExtractorError, - urlencode_postdata, - extract_attributes, smuggle_url, + urlencode_postdata, ) +from .common import InfoExtractor class TouTvIE(InfoExtractor): diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py index 938e05076..044be08da 100644 --- a/youtube_dl/extractor/toypics.py +++ b/youtube_dl/extractor/toypics.py @@ -1,9 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor import re +from .common import InfoExtractor + class ToypicsIE(InfoExtractor): IE_DESC = 'Toypics user profile' diff --git a/youtube_dl/extractor/trilulilu.py b/youtube_dl/extractor/trilulilu.py index a800449e9..bc4b1c157 100644 --- a/youtube_dl/extractor/trilulilu.py +++ b/youtube_dl/extractor/trilulilu.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import ExtractorError, int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - parse_iso8601, -) class TriluliluIE(InfoExtractor): diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py index 1853a1104..3334fb973 100644 --- a/youtube_dl/extractor/tube8.py +++ b/youtube_dl/extractor/tube8.py @@ -2,10 +2,7 @@ from __future__ import unicode_literals import re -from ..utils import ( - int_or_none, - str_to_int, -) +from ..utils import int_or_none, str_to_int from .keezmovies import KeezMoviesIE diff --git a/youtube_dl/extractor/tubitv.py b/youtube_dl/extractor/tubitv.py index 3a37df2e8..cb63e334c 100644 --- a/youtube_dl/extractor/tubitv.py +++ b/youtube_dl/extractor/tubitv.py @@ -3,13 +3,13 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class TubiTvIE(InfoExtractor): diff --git a/youtube_dl/extractor/tudou.py b/youtube_dl/extractor/tudou.py index 2aae55e7e..b63003511 100644 --- a/youtube_dl/extractor/tudou.py +++ b/youtube_dl/extractor/tudou.py @@ -2,15 +2,15 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( ExtractorError, - int_or_none, InAdvancePagedList, float_or_none, + int_or_none, unescapeHTML, ) +from .common import InfoExtractor class TudouIE(InfoExtractor): diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 786143525..3706ae093 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class TumblrIE(InfoExtractor): diff --git a/youtube_dl/extractor/tunein.py b/youtube_dl/extractor/tunein.py index 7e51de89e..4328383a4 100644 --- a/youtube_dl/extractor/tunein.py +++ b/youtube_dl/extractor/tunein.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..utils import ExtractorError from ..compat import compat_urlparse +from ..utils import ExtractorError +from .common import InfoExtractor class TuneInBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/turbo.py b/youtube_dl/extractor/turbo.py index 25aa9c58e..6a2147754 100644 --- a/youtube_dl/extractor/turbo.py +++ b/youtube_dl/extractor/turbo.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, qualities, xpath_text from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - qualities, - xpath_text, -) class TurboIE(InfoExtractor): diff --git a/youtube_dl/extractor/turner.py b/youtube_dl/extractor/turner.py index 57ffedb87..5a407b3f8 100644 --- a/youtube_dl/extractor/turner.py +++ b/youtube_dl/extractor/turner.py @@ -3,17 +3,17 @@ from __future__ import unicode_literals import re -from .adobepass import AdobePassIE from ..compat import compat_str from ..utils import ( - xpath_text, - int_or_none, - determine_ext, - parse_duration, - xpath_attr, - update_url_query, ExtractorError, + determine_ext, + int_or_none, + parse_duration, + update_url_query, + xpath_attr, + xpath_text, ) +from .adobepass import AdobePassIE class TurnerBaseIE(AdobePassIE): diff --git a/youtube_dl/extractor/tutv.py b/youtube_dl/extractor/tutv.py index 822372ea1..bdfe01928 100644 --- a/youtube_dl/extractor/tutv.py +++ b/youtube_dl/extractor/tutv.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import base64 -from .common import InfoExtractor from ..compat import compat_parse_qs +from .common import InfoExtractor class TutvIE(InfoExtractor): diff --git a/youtube_dl/extractor/tv2.py b/youtube_dl/extractor/tv2.py index d5071e8a5..f78bc16cd 100644 --- a/youtube_dl/extractor/tv2.py +++ b/youtube_dl/extractor/tv2.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( determine_ext, - int_or_none, float_or_none, + int_or_none, js_to_json, parse_iso8601, remove_end, ) +from .common import InfoExtractor class TV2IE(InfoExtractor): diff --git a/youtube_dl/extractor/tv4.py b/youtube_dl/extractor/tv4.py index ad79db92b..e2a48ddb6 100644 --- a/youtube_dl/extractor/tv4.py +++ b/youtube_dl/extractor/tv4.py @@ -1,14 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - int_or_none, - parse_iso8601, - try_get, - determine_ext, -) +from ..utils import determine_ext, int_or_none, parse_iso8601, try_get +from .common import InfoExtractor class TV4IE(InfoExtractor): diff --git a/youtube_dl/extractor/tva.py b/youtube_dl/extractor/tva.py index 3ced098f9..bdddde15d 100644 --- a/youtube_dl/extractor/tva.py +++ b/youtube_dl/extractor/tva.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601, smuggle_url from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, - smuggle_url, -) class TVAIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvanouvelles.py b/youtube_dl/extractor/tvanouvelles.py index 1086176a2..c649f6413 100644 --- a/youtube_dl/extractor/tvanouvelles.py +++ b/youtube_dl/extractor/tvanouvelles.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from .brightcove import BrightcoveNewIE +from .common import InfoExtractor class TVANouvellesIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvc.py b/youtube_dl/extractor/tvc.py index 008f64cc2..68dc5e506 100644 --- a/youtube_dl/extractor/tvc.py +++ b/youtube_dl/extractor/tvc.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import clean_html, int_or_none from .common import InfoExtractor -from ..utils import ( - clean_html, - int_or_none, -) class TVCIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvigle.py b/youtube_dl/extractor/tvigle.py index f3817ab28..354a78e3c 100644 --- a/youtube_dl/extractor/tvigle.py +++ b/youtube_dl/extractor/tvigle.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, float_or_none, int_or_none, parse_age_limit from .common import InfoExtractor -from ..utils import ( - ExtractorError, - float_or_none, - int_or_none, - parse_age_limit, -) class TvigleIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvnoe.py b/youtube_dl/extractor/tvnoe.py index 6d5c74826..e9e6961bf 100644 --- a/youtube_dl/extractor/tvnoe.py +++ b/youtube_dl/extractor/tvnoe.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import clean_html, get_element_by_class, js_to_json from .jwplatform import JWPlatformBaseIE -from ..utils import ( - clean_html, - get_element_by_class, - js_to_json, -) class TVNoeIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/tvp.py b/youtube_dl/extractor/tvp.py index 06ea2b40a..ba319c2a0 100644 --- a/youtube_dl/extractor/tvp.py +++ b/youtube_dl/extractor/tvp.py @@ -3,13 +3,13 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - determine_ext, - clean_html, - get_element_by_attribute, ExtractorError, + clean_html, + determine_ext, + get_element_by_attribute, ) +from .common import InfoExtractor class TVPIE(InfoExtractor): diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py index 3eda0a399..cf469bca4 100644 --- a/youtube_dl/extractor/tvplay.py +++ b/youtube_dl/extractor/tvplay.py @@ -3,21 +3,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, - compat_urlparse, -) +from ..compat import compat_HTTPError, compat_str, compat_urlparse from ..utils import ( - determine_ext, ExtractorError, + determine_ext, int_or_none, parse_iso8601, qualities, try_get, update_url_query, ) +from .common import InfoExtractor class TVPlayIE(InfoExtractor): diff --git a/youtube_dl/extractor/tweakers.py b/youtube_dl/extractor/tweakers.py index 2b10d9bca..ccb85bfae 100644 --- a/youtube_dl/extractor/tweakers.py +++ b/youtube_dl/extractor/tweakers.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals +from ..utils import determine_ext, int_or_none, mimetype2ext from .common import InfoExtractor -from ..utils import ( - int_or_none, - determine_ext, - mimetype2ext, -) class TweakersIE(InfoExtractor): diff --git a/youtube_dl/extractor/twentyfourvideo.py b/youtube_dl/extractor/twentyfourvideo.py index a983ebf05..707e39a30 100644 --- a/youtube_dl/extractor/twentyfourvideo.py +++ b/youtube_dl/extractor/twentyfourvideo.py @@ -1,13 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601, xpath_attr, xpath_element from .common import InfoExtractor -from ..utils import ( - parse_iso8601, - int_or_none, - xpath_attr, - xpath_element, -) class TwentyFourVideoIE(InfoExtractor): diff --git a/youtube_dl/extractor/twentymin.py b/youtube_dl/extractor/twentymin.py index 4fd1aa4bf..d5ace7ee3 100644 --- a/youtube_dl/extractor/twentymin.py +++ b/youtube_dl/extractor/twentymin.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, try_get from .common import InfoExtractor -from ..utils import ( - int_or_none, - try_get, -) class TwentyMinutenIE(InfoExtractor): diff --git a/youtube_dl/extractor/twentytwotracks.py b/youtube_dl/extractor/twentytwotracks.py index d6c0ab184..053c345c9 100644 --- a/youtube_dl/extractor/twentytwotracks.py +++ b/youtube_dl/extractor/twentytwotracks.py @@ -2,8 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor + # 22Tracks regularly replace the audio tracks that can be streamed on their # site. The tracks usually expire after 1 months, so we can't add tests. diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py index 1ca159a4d..a8f326b58 100644 --- a/youtube_dl/extractor/twitch.py +++ b/youtube_dl/extractor/twitch.py @@ -2,10 +2,9 @@ from __future__ import unicode_literals import itertools -import re import random +import re -from .common import InfoExtractor from ..compat import ( compat_HTTPError, compat_parse_qs, @@ -15,8 +14,8 @@ from ..compat import ( compat_urlparse, ) from ..utils import ( - clean_html, ExtractorError, + clean_html, int_or_none, js_to_json, orderedSet, @@ -25,6 +24,7 @@ from ..utils import ( update_url_query, urlencode_postdata, ) +from .common import InfoExtractor class TwitchBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py index 37e3bc412..a3b5769bf 100644 --- a/youtube_dl/extractor/twitter.py +++ b/youtube_dl/extractor/twitter.py @@ -3,17 +3,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( + ExtractorError, determine_ext, float_or_none, - xpath_text, - remove_end, int_or_none, - ExtractorError, + remove_end, + xpath_text, ) - +from .common import InfoExtractor from .periscope import PeriscopeIE diff --git a/youtube_dl/extractor/udemy.py b/youtube_dl/extractor/udemy.py index cce29c6e0..d241b775e 100644 --- a/youtube_dl/extractor/udemy.py +++ b/youtube_dl/extractor/udemy.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import ( compat_HTTPError, compat_str, @@ -10,15 +9,16 @@ from ..compat import ( compat_urlparse, ) from ..utils import ( + ExtractorError, determine_ext, extract_attributes, - ExtractorError, float_or_none, int_or_none, sanitized_Request, unescapeHTML, urlencode_postdata, ) +from .common import InfoExtractor class UdemyIE(InfoExtractor): diff --git a/youtube_dl/extractor/udn.py b/youtube_dl/extractor/udn.py index daf45d0b4..845567a2a 100644 --- a/youtube_dl/extractor/udn.py +++ b/youtube_dl/extractor/udn.py @@ -4,13 +4,9 @@ from __future__ import unicode_literals import json import re -from .common import InfoExtractor -from ..utils import ( - determine_ext, - int_or_none, - js_to_json, -) from ..compat import compat_urlparse +from ..utils import determine_ext, int_or_none, js_to_json +from .common import InfoExtractor class UDNEmbedIE(InfoExtractor): diff --git a/youtube_dl/extractor/unistra.py b/youtube_dl/extractor/unistra.py index a724cdbef..19a4fee7b 100644 --- a/youtube_dl/extractor/unistra.py +++ b/youtube_dl/extractor/unistra.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import qualities +from .common import InfoExtractor class UnistraIE(InfoExtractor): diff --git a/youtube_dl/extractor/uol.py b/youtube_dl/extractor/uol.py index e67083004..7dbad479c 100644 --- a/youtube_dl/extractor/uol.py +++ b/youtube_dl/extractor/uol.py @@ -1,14 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( clean_html, int_or_none, parse_duration, - update_url_query, str_or_none, + update_url_query, ) +from .common import InfoExtractor class UOLIE(InfoExtractor): diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dl/extractor/uplynk.py index f06bf5b12..7b980fb46 100644 --- a/youtube_dl/extractor/uplynk.py +++ b/youtube_dl/extractor/uplynk.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, float_or_none from .common import InfoExtractor -from ..utils import ( - float_or_none, - ExtractorError, -) class UplynkIE(InfoExtractor): diff --git a/youtube_dl/extractor/urort.py b/youtube_dl/extractor/urort.py index 8f6edab4b..3dc595a0a 100644 --- a/youtube_dl/extractor/urort.py +++ b/youtube_dl/extractor/urort.py @@ -1,13 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_urllib_parse +from ..utils import unified_strdate from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse, -) -from ..utils import ( - unified_strdate, -) class UrortIE(InfoExtractor): diff --git a/youtube_dl/extractor/usanetwork.py b/youtube_dl/extractor/usanetwork.py index 823340776..28ffdaa65 100644 --- a/youtube_dl/extractor/usanetwork.py +++ b/youtube_dl/extractor/usanetwork.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import extract_attributes, smuggle_url, update_url_query from .adobepass import AdobePassIE -from ..utils import ( - extract_attributes, - smuggle_url, - update_url_query, -) class USANetworkIE(AdobePassIE): diff --git a/youtube_dl/extractor/usatoday.py b/youtube_dl/extractor/usatoday.py index e5678dc78..7bb391acd 100644 --- a/youtube_dl/extractor/usatoday.py +++ b/youtube_dl/extractor/usatoday.py @@ -1,14 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor +from ..compat import compat_str from ..utils import ( + ExtractorError, get_element_by_attribute, parse_duration, update_url_query, - ExtractorError, ) -from ..compat import compat_str +from .common import InfoExtractor class USATodayIE(InfoExtractor): diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py index 5737d4d16..de87da5e8 100644 --- a/youtube_dl/extractor/ustream.py +++ b/youtube_dl/extractor/ustream.py @@ -3,19 +3,16 @@ from __future__ import unicode_literals import random import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - encode_data_uri, ExtractorError, - int_or_none, + encode_data_uri, float_or_none, + int_or_none, mimetype2ext, str_or_none, ) +from .common import InfoExtractor class UstreamIE(InfoExtractor): diff --git a/youtube_dl/extractor/ustudio.py b/youtube_dl/extractor/ustudio.py index 56509beed..f500d775d 100644 --- a/youtube_dl/extractor/ustudio.py +++ b/youtube_dl/extractor/ustudio.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, unescapeHTML, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, - unescapeHTML, -) class UstudioIE(InfoExtractor): diff --git a/youtube_dl/extractor/varzesh3.py b/youtube_dl/extractor/varzesh3.py index f474ed73f..476c8d09e 100644 --- a/youtube_dl/extractor/varzesh3.py +++ b/youtube_dl/extractor/varzesh3.py @@ -1,15 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals +from ..compat import compat_parse_qs, compat_urllib_parse_urlparse +from ..utils import clean_html, remove_start from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, - compat_parse_qs, -) -from ..utils import ( - clean_html, - remove_start, -) class Varzesh3IE(InfoExtractor): diff --git a/youtube_dl/extractor/vbox7.py b/youtube_dl/extractor/vbox7.py index bef639462..adb31975e 100644 --- a/youtube_dl/extractor/vbox7.py +++ b/youtube_dl/extractor/vbox7.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class Vbox7IE(InfoExtractor): diff --git a/youtube_dl/extractor/veehd.py b/youtube_dl/extractor/veehd.py index 0d8d832cc..beba774b8 100644 --- a/youtube_dl/extractor/veehd.py +++ b/youtube_dl/extractor/veehd.py @@ -1,18 +1,11 @@ from __future__ import unicode_literals -import re import json +import re +from ..compat import compat_urllib_parse_unquote, compat_urlparse +from ..utils import ExtractorError, clean_html, get_element_by_id from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_urlparse, -) -from ..utils import ( - ExtractorError, - clean_html, - get_element_by_id, -) class VeeHDIE(InfoExtractor): diff --git a/youtube_dl/extractor/veoh.py b/youtube_dl/extractor/veoh.py index 0f5d68738..70f5fc7a7 100644 --- a/youtube_dl/extractor/veoh.py +++ b/youtube_dl/extractor/veoh.py @@ -1,14 +1,10 @@ from __future__ import unicode_literals -import re import json +import re +from ..utils import ExtractorError, int_or_none, sanitized_Request from .common import InfoExtractor -from ..utils import ( - int_or_none, - ExtractorError, - sanitized_Request, -) class VeohIE(InfoExtractor): diff --git a/youtube_dl/extractor/vessel.py b/youtube_dl/extractor/vessel.py index 80a643dfe..69ab202bb 100644 --- a/youtube_dl/extractor/vessel.py +++ b/youtube_dl/extractor/vessel.py @@ -4,12 +4,8 @@ from __future__ import unicode_literals import json import re +from ..utils import ExtractorError, parse_iso8601, sanitized_Request from .common import InfoExtractor -from ..utils import ( - ExtractorError, - parse_iso8601, - sanitized_Request, -) class VesselIE(InfoExtractor): diff --git a/youtube_dl/extractor/vesti.py b/youtube_dl/extractor/vesti.py index 5ab716880..5c2baa7e4 100644 --- a/youtube_dl/extractor/vesti.py +++ b/youtube_dl/extractor/vesti.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor from .rutv import RUTVIE diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index c4e37f694..e5e1d1a18 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -2,18 +2,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, - compat_HTTPError, -) +from ..compat import compat_HTTPError, compat_str, compat_urlparse from ..utils import ( ExtractorError, int_or_none, - sanitized_Request, parse_iso8601, + sanitized_Request, ) +from .common import InfoExtractor class VevoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dl/extractor/vgtv.py index 8a574bc26..be5275b12 100644 --- a/youtube_dl/extractor/vgtv.py +++ b/youtube_dl/extractor/vgtv.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, float_or_none, try_get from .common import InfoExtractor from .xstream import XstreamIE -from ..utils import ( - ExtractorError, - float_or_none, - try_get, -) class VGTVIE(XstreamIE): diff --git a/youtube_dl/extractor/vh1.py b/youtube_dl/extractor/vh1.py index 6be3774b7..53dacd8f3 100644 --- a/youtube_dl/extractor/vh1.py +++ b/youtube_dl/extractor/vh1.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals -from .mtv import MTVIE - import re + from ..utils import fix_xml_ampersands +from .mtv import MTVIE class VH1IE(MTVIE): diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py index 8a00c8fee..7bff6d257 100644 --- a/youtube_dl/extractor/vice.py +++ b/youtube_dl/extractor/vice.py @@ -1,22 +1,22 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import time import hashlib import json +import re +import time -from .adobepass import AdobePassIE -from .common import InfoExtractor from ..compat import compat_HTTPError from ..utils import ( - int_or_none, - parse_age_limit, - str_or_none, - parse_duration, ExtractorError, extract_attributes, + int_or_none, + parse_age_limit, + parse_duration, + str_or_none, ) +from .adobepass import AdobePassIE +from .common import InfoExtractor class ViceBaseIE(AdobePassIE): diff --git a/youtube_dl/extractor/vidbit.py b/youtube_dl/extractor/vidbit.py index 91f45b7cc..8aab80ea9 100644 --- a/youtube_dl/extractor/vidbit.py +++ b/youtube_dl/extractor/vidbit.py @@ -1,13 +1,8 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse -from ..utils import ( - int_or_none, - js_to_json, - remove_end, - unified_strdate, -) +from ..utils import int_or_none, js_to_json, remove_end, unified_strdate +from .common import InfoExtractor class VidbitIE(InfoExtractor): diff --git a/youtube_dl/extractor/viddler.py b/youtube_dl/extractor/viddler.py index 67808e7e6..6e97d9b07 100644 --- a/youtube_dl/extractor/viddler.py +++ b/youtube_dl/extractor/viddler.py @@ -1,15 +1,8 @@ from __future__ import unicode_literals +from ..compat import compat_urllib_parse_urlencode, compat_urlparse +from ..utils import float_or_none, int_or_none, sanitized_Request from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_urlparse, -) -from ..utils import ( - float_or_none, - int_or_none, - sanitized_Request, -) class ViddlerIE(InfoExtractor): diff --git a/youtube_dl/extractor/videa.py b/youtube_dl/extractor/videa.py index 311df58f4..128117ea6 100644 --- a/youtube_dl/extractor/videa.py +++ b/youtube_dl/extractor/videa.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( int_or_none, mimetype2ext, @@ -11,6 +10,7 @@ from ..utils import ( xpath_element, xpath_text, ) +from .common import InfoExtractor class VideaIE(InfoExtractor): diff --git a/youtube_dl/extractor/videodetective.py b/youtube_dl/extractor/videodetective.py index a19411a05..0b5c360d8 100644 --- a/youtube_dl/extractor/videodetective.py +++ b/youtube_dl/extractor/videodetective.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urlparse +from .common import InfoExtractor from .internetvideoarchive import InternetVideoArchiveIE diff --git a/youtube_dl/extractor/videofyme.py b/youtube_dl/extractor/videofyme.py index cd3f50a63..e999b8186 100644 --- a/youtube_dl/extractor/videofyme.py +++ b/youtube_dl/extractor/videofyme.py @@ -1,10 +1,7 @@ from __future__ import unicode_literals +from ..utils import int_or_none, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_iso8601, -) class VideofyMeIE(InfoExtractor): diff --git a/youtube_dl/extractor/videomega.py b/youtube_dl/extractor/videomega.py index c02830ddd..7ba75b1bc 100644 --- a/youtube_dl/extractor/videomega.py +++ b/youtube_dl/extractor/videomega.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import decode_packed_codes, sanitized_Request from .common import InfoExtractor -from ..utils import ( - decode_packed_codes, - sanitized_Request, -) class VideoMegaIE(InfoExtractor): diff --git a/youtube_dl/extractor/videomore.py b/youtube_dl/extractor/videomore.py index 9b56630de..2a76bfb55 100644 --- a/youtube_dl/extractor/videomore.py +++ b/youtube_dl/extractor/videomore.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, xpath_element, xpath_text from .common import InfoExtractor -from ..utils import ( - int_or_none, - xpath_element, - xpath_text, -) class VideomoreIE(InfoExtractor): diff --git a/youtube_dl/extractor/videopremium.py b/youtube_dl/extractor/videopremium.py index 5de8273c3..377d5e4db 100644 --- a/youtube_dl/extractor/videopremium.py +++ b/youtube_dl/extractor/videopremium.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -import re import random +import re from .common import InfoExtractor diff --git a/youtube_dl/extractor/vidio.py b/youtube_dl/extractor/vidio.py index 4e4b4e38c..44d4e3c53 100644 --- a/youtube_dl/extractor/vidio.py +++ b/youtube_dl/extractor/vidio.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class VidioIE(InfoExtractor): diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py index e9ff336c4..1ab371c67 100644 --- a/youtube_dl/extractor/vidme.py +++ b/youtube_dl/extractor/vidme.py @@ -2,14 +2,9 @@ from __future__ import unicode_literals import itertools -from .common import InfoExtractor from ..compat import compat_HTTPError -from ..utils import ( - ExtractorError, - int_or_none, - float_or_none, - parse_iso8601, -) +from ..utils import ExtractorError, float_or_none, int_or_none, parse_iso8601 +from .common import InfoExtractor class VidmeIE(InfoExtractor): diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dl/extractor/vidzi.py index 9950c62ad..77f542815 100644 --- a/youtube_dl/extractor/vidzi.py +++ b/youtube_dl/extractor/vidzi.py @@ -3,13 +3,13 @@ from __future__ import unicode_literals import re -from .jwplatform import JWPlatformBaseIE from ..utils import ( - decode_packed_codes, - js_to_json, NO_DEFAULT, PACKED_CODES_RE, + decode_packed_codes, + js_to_json, ) +from .jwplatform import JWPlatformBaseIE class VidziIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/vier.py b/youtube_dl/extractor/vier.py index d26fb49b3..937728787 100644 --- a/youtube_dl/extractor/vier.py +++ b/youtube_dl/extractor/vier.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re from .common import InfoExtractor diff --git a/youtube_dl/extractor/viewlift.py b/youtube_dl/extractor/viewlift.py index 18735cfb2..58d98a5c6 100644 --- a/youtube_dl/extractor/viewlift.py +++ b/youtube_dl/extractor/viewlift.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( ExtractorError, clean_html, @@ -11,6 +10,7 @@ from ..utils import ( js_to_json, parse_duration, ) +from .common import InfoExtractor class ViewLiftBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/viewster.py b/youtube_dl/extractor/viewster.py index 52dd95e2f..83e8e30eb 100644 --- a/youtube_dl/extractor/viewster.py +++ b/youtube_dl/extractor/viewster.py @@ -3,20 +3,17 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_urllib_parse_unquote, -) +from ..compat import compat_HTTPError, compat_urllib_parse_unquote from ..utils import ( - determine_ext, ExtractorError, + HEADRequest, + determine_ext, int_or_none, parse_iso8601, sanitized_Request, - HEADRequest, url_basename, ) +from .common import InfoExtractor class ViewsterIE(InfoExtractor): diff --git a/youtube_dl/extractor/viidea.py b/youtube_dl/extractor/viidea.py index 4adcd1830..0b183e0b9 100644 --- a/youtube_dl/extractor/viidea.py +++ b/youtube_dl/extractor/viidea.py @@ -2,16 +2,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_str, compat_urlparse +from ..utils import js_to_json, parse_duration, parse_iso8601 from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_str, -) -from ..utils import ( - parse_duration, - js_to_json, - parse_iso8601, -) class ViideaIE(InfoExtractor): diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py index 9c48701c1..fc11c0cb4 100644 --- a/youtube_dl/extractor/viki.py +++ b/youtube_dl/extractor/viki.py @@ -8,7 +8,6 @@ import json import re import time -from .common import InfoExtractor from ..utils import ( ExtractorError, int_or_none, @@ -16,6 +15,7 @@ from ..utils import ( parse_iso8601, sanitized_Request, ) +from .common import InfoExtractor class VikiBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index c12eeadd4..ce50452c6 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -1,33 +1,29 @@ # coding: utf-8 from __future__ import unicode_literals +import itertools import json import re -import itertools -from .common import InfoExtractor -from ..compat import ( - compat_HTTPError, - compat_str, - compat_urlparse, -) +from ..compat import compat_HTTPError, compat_str, compat_urlparse from ..utils import ( - determine_ext, + NO_DEFAULT, ExtractorError, InAdvancePagedList, - int_or_none, - NO_DEFAULT, RegexNotFoundError, + determine_ext, + int_or_none, + parse_filesize, sanitized_Request, smuggle_url, std_headers, + try_get, + unescapeHTML, unified_strdate, unsmuggle_url, urlencode_postdata, - unescapeHTML, - parse_filesize, - try_get, ) +from .common import InfoExtractor class VimeoBaseInfoExtractor(InfoExtractor): diff --git a/youtube_dl/extractor/vimple.py b/youtube_dl/extractor/vimple.py index c74b43766..13fa7ebcd 100644 --- a/youtube_dl/extractor/vimple.py +++ b/youtube_dl/extractor/vimple.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class SprutoBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index 0183f052a..b1c0478b9 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -1,14 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import itertools +import re +from ..utils import int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) class VineIE(InfoExtractor): diff --git a/youtube_dl/extractor/viu.py b/youtube_dl/extractor/viu.py index 3fd889c8e..aac673283 100644 --- a/youtube_dl/extractor/viu.py +++ b/youtube_dl/extractor/viu.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, -) +from ..utils import ExtractorError, int_or_none +from .common import InfoExtractor class ViuBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index 6e6c3a0e1..81c121e00 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -5,14 +5,10 @@ import collections import re import sys -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( - clean_html, ExtractorError, + clean_html, get_element_by_class, int_or_none, orderedSet, @@ -22,6 +18,7 @@ from ..utils import ( unified_timestamp, urlencode_postdata, ) +from .common import InfoExtractor from .dailymotion import DailymotionIE from .pladform import PladformIE from .vimeo import VimeoIE diff --git a/youtube_dl/extractor/vlive.py b/youtube_dl/extractor/vlive.py index b9718901b..30ae2fa9e 100644 --- a/youtube_dl/extractor/vlive.py +++ b/youtube_dl/extractor/vlive.py @@ -1,24 +1,21 @@ # coding: utf-8 from __future__ import unicode_literals +import itertools import re import time -import itertools -from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_str, -) +from ..compat import compat_str, compat_urllib_parse_urlencode from ..utils import ( - dict_get, ExtractorError, + dict_get, float_or_none, int_or_none, remove_start, try_get, urlencode_postdata, ) +from .common import InfoExtractor class VLiveIE(InfoExtractor): diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dl/extractor/vodlocker.py index 02c9617d2..a38bde7ba 100644 --- a/youtube_dl/extractor/vodlocker.py +++ b/youtube_dl/extractor/vodlocker.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ( - ExtractorError, NO_DEFAULT, + ExtractorError, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class VodlockerIE(InfoExtractor): diff --git a/youtube_dl/extractor/vodplatform.py b/youtube_dl/extractor/vodplatform.py index 239644340..0276ecc74 100644 --- a/youtube_dl/extractor/vodplatform.py +++ b/youtube_dl/extractor/vodplatform.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import unescapeHTML +from .common import InfoExtractor class VODPlatformIE(InfoExtractor): diff --git a/youtube_dl/extractor/voicerepublic.py b/youtube_dl/extractor/voicerepublic.py index 59e1359c4..91a0f22f9 100644 --- a/youtube_dl/extractor/voicerepublic.py +++ b/youtube_dl/extractor/voicerepublic.py @@ -2,17 +2,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urlparse, -) +from ..compat import compat_str, compat_urlparse from ..utils import ( ExtractorError, determine_ext, int_or_none, sanitized_Request, ) +from .common import InfoExtractor class VoiceRepublicIE(InfoExtractor): diff --git a/youtube_dl/extractor/voxmedia.py b/youtube_dl/extractor/voxmedia.py index f8e331493..7240f9558 100644 --- a/youtube_dl/extractor/voxmedia.py +++ b/youtube_dl/extractor/voxmedia.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class VoxMediaIE(InfoExtractor): diff --git a/youtube_dl/extractor/vporn.py b/youtube_dl/extractor/vporn.py index 858ac9e71..e298f9a4c 100644 --- a/youtube_dl/extractor/vporn.py +++ b/youtube_dl/extractor/vporn.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, parse_duration, str_to_int, urljoin from .common import InfoExtractor -from ..utils import ( - ExtractorError, - parse_duration, - str_to_int, - urljoin, -) class VpornIE(InfoExtractor): diff --git a/youtube_dl/extractor/vrt.py b/youtube_dl/extractor/vrt.py index 00c72e346..04ec165f7 100644 --- a/youtube_dl/extractor/vrt.py +++ b/youtube_dl/extractor/vrt.py @@ -3,10 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import float_or_none from .common import InfoExtractor -from ..utils import ( - float_or_none, -) class VRTIE(InfoExtractor): diff --git a/youtube_dl/extractor/vube.py b/youtube_dl/extractor/vube.py index 8ce3a6b81..66b42bda6 100644 --- a/youtube_dl/extractor/vube.py +++ b/youtube_dl/extractor/vube.py @@ -2,14 +2,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_str +from ..utils import ExtractorError, int_or_none from .common import InfoExtractor -from ..compat import ( - compat_str, -) -from ..utils import ( - int_or_none, - ExtractorError, -) class VubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/vuclip.py b/youtube_dl/extractor/vuclip.py index 55e087bdb..90956c28c 100644 --- a/youtube_dl/extractor/vuclip.py +++ b/youtube_dl/extractor/vuclip.py @@ -2,15 +2,9 @@ from __future__ import unicode_literals import re +from ..compat import compat_urllib_parse_urlparse +from ..utils import ExtractorError, parse_duration, remove_end from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, -) -from ..utils import ( - ExtractorError, - parse_duration, - remove_end, -) class VuClipIE(InfoExtractor): diff --git a/youtube_dl/extractor/vvvvid.py b/youtube_dl/extractor/vvvvid.py index d44ec85fd..f95e14d44 100644 --- a/youtube_dl/extractor/vvvvid.py +++ b/youtube_dl/extractor/vvvvid.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, str_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - str_or_none, -) class VVVVIDIE(InfoExtractor): diff --git a/youtube_dl/extractor/vyborymos.py b/youtube_dl/extractor/vyborymos.py index 9e703c4b6..3c84c831d 100644 --- a/youtube_dl/extractor/vyborymos.py +++ b/youtube_dl/extractor/vyborymos.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_str +from .common import InfoExtractor class VyboryMosIE(InfoExtractor): diff --git a/youtube_dl/extractor/vzaar.py b/youtube_dl/extractor/vzaar.py index b270f08d1..555b50c5e 100644 --- a/youtube_dl/extractor/vzaar.py +++ b/youtube_dl/extractor/vzaar.py @@ -1,11 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import float_or_none, int_or_none from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, -) class VzaarIE(InfoExtractor): diff --git a/youtube_dl/extractor/walla.py b/youtube_dl/extractor/walla.py index cbb548672..1b685c05b 100644 --- a/youtube_dl/extractor/walla.py +++ b/youtube_dl/extractor/walla.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, xpath_text from .common import InfoExtractor -from ..utils import ( - xpath_text, - int_or_none, -) class WallaIE(InfoExtractor): diff --git a/youtube_dl/extractor/washingtonpost.py b/youtube_dl/extractor/washingtonpost.py index 839cad986..054a3a8f0 100644 --- a/youtube_dl/extractor/washingtonpost.py +++ b/youtube_dl/extractor/washingtonpost.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, strip_jsonp from .common import InfoExtractor -from ..utils import ( - int_or_none, - strip_jsonp, -) class WashingtonPostIE(InfoExtractor): diff --git a/youtube_dl/extractor/wat.py b/youtube_dl/extractor/wat.py index 20fef1f04..87f75ef9a 100644 --- a/youtube_dl/extractor/wat.py +++ b/youtube_dl/extractor/wat.py @@ -3,14 +3,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - unified_strdate, - HEADRequest, - int_or_none, -) +from ..utils import ExtractorError, HEADRequest, int_or_none, unified_strdate +from .common import InfoExtractor class WatIE(InfoExtractor): diff --git a/youtube_dl/extractor/watchindianporn.py b/youtube_dl/extractor/watchindianporn.py index ed099beea..dc3004158 100644 --- a/youtube_dl/extractor/watchindianporn.py +++ b/youtube_dl/extractor/watchindianporn.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration, unified_strdate from .common import InfoExtractor -from ..utils import ( - unified_strdate, - parse_duration, - int_or_none, -) class WatchIndianPornIE(InfoExtractor): diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py index f7e6360a3..4f2d45d3d 100644 --- a/youtube_dl/extractor/wdr.py +++ b/youtube_dl/extractor/wdr.py @@ -3,16 +3,16 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - determine_ext, ExtractorError, + determine_ext, js_to_json, strip_jsonp, unified_strdate, update_url_query, urlhandle_detect_ext, ) +from .common import InfoExtractor class WDRBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/webcaster.py b/youtube_dl/extractor/webcaster.py index e4b65f54f..744f538db 100644 --- a/youtube_dl/extractor/webcaster.py +++ b/youtube_dl/extractor/webcaster.py @@ -3,11 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import determine_ext, xpath_text from .common import InfoExtractor -from ..utils import ( - determine_ext, - xpath_text, -) class WebcasterIE(InfoExtractor): diff --git a/youtube_dl/extractor/webofstories.py b/youtube_dl/extractor/webofstories.py index 1eb1f6702..ae9a6210e 100644 --- a/youtube_dl/extractor/webofstories.py +++ b/youtube_dl/extractor/webofstories.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import int_or_none +from .common import InfoExtractor class WebOfStoriesIE(InfoExtractor): diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index 54eb51427..1137de17e 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .youtube import YoutubeIE from .jwplatform import JWPlatformBaseIE +from .youtube import YoutubeIE class WimpIE(JWPlatformBaseIE): diff --git a/youtube_dl/extractor/wistia.py b/youtube_dl/extractor/wistia.py index c634b8dec..fd985a01b 100644 --- a/youtube_dl/extractor/wistia.py +++ b/youtube_dl/extractor/wistia.py @@ -1,11 +1,7 @@ from __future__ import unicode_literals +from ..utils import ExtractorError, float_or_none, int_or_none from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - float_or_none, -) class WistiaIE(InfoExtractor): diff --git a/youtube_dl/extractor/wrzuta.py b/youtube_dl/extractor/wrzuta.py index 0f53f1bcb..9067b3d0a 100644 --- a/youtube_dl/extractor/wrzuta.py +++ b/youtube_dl/extractor/wrzuta.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, qualities, remove_start from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - qualities, - remove_start, -) class WrzutaIE(InfoExtractor): diff --git a/youtube_dl/extractor/wsj.py b/youtube_dl/extractor/wsj.py index deb7483ae..480f8816e 100644 --- a/youtube_dl/extractor/wsj.py +++ b/youtube_dl/extractor/wsj.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import float_or_none, int_or_none, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - float_or_none, - unified_strdate, -) class WSJIE(InfoExtractor): diff --git a/youtube_dl/extractor/xbef.py b/youtube_dl/extractor/xbef.py index 4c41e98b2..2acf632fa 100644 --- a/youtube_dl/extractor/xbef.py +++ b/youtube_dl/extractor/xbef.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class XBefIE(InfoExtractor): diff --git a/youtube_dl/extractor/xboxclips.py b/youtube_dl/extractor/xboxclips.py index d9c277bc3..999a4d444 100644 --- a/youtube_dl/extractor/xboxclips.py +++ b/youtube_dl/extractor/xboxclips.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import int_or_none, parse_filesize, unified_strdate from .common import InfoExtractor -from ..utils import ( - int_or_none, - parse_filesize, - unified_strdate, -) class XboxClipsIE(InfoExtractor): diff --git a/youtube_dl/extractor/xfileshare.py b/youtube_dl/extractor/xfileshare.py index e616adce3..f514cd6f6 100644 --- a/youtube_dl/extractor/xfileshare.py +++ b/youtube_dl/extractor/xfileshare.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( - decode_packed_codes, - ExtractorError, - int_or_none, NO_DEFAULT, + ExtractorError, + decode_packed_codes, + int_or_none, sanitized_Request, urlencode_postdata, ) +from .common import InfoExtractor class XFileShareIE(InfoExtractor): diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 36a8c9840..3bb5d6de4 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -2,13 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import dict_get, int_or_none, parse_duration, unified_strdate from .common import InfoExtractor -from ..utils import ( - dict_get, - int_or_none, - parse_duration, - unified_strdate, -) class XHamsterIE(InfoExtractor): diff --git a/youtube_dl/extractor/xiami.py b/youtube_dl/extractor/xiami.py index d017e03de..8a96b1001 100644 --- a/youtube_dl/extractor/xiami.py +++ b/youtube_dl/extractor/xiami.py @@ -1,9 +1,9 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote from ..utils import int_or_none +from .common import InfoExtractor class XiamiBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/xminus.py b/youtube_dl/extractor/xminus.py index 36e5ead1e..a7bf544ef 100644 --- a/youtube_dl/extractor/xminus.py +++ b/youtube_dl/extractor/xminus.py @@ -4,14 +4,9 @@ from __future__ import unicode_literals import re import time +from ..compat import compat_ord +from ..utils import int_or_none, parse_duration from .common import InfoExtractor -from ..compat import ( - compat_ord, -) -from ..utils import ( - int_or_none, - parse_duration, -) class XMinusIE(InfoExtractor): diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dl/extractor/xnxx.py index e0a6255dc..6e6400b90 100644 --- a/youtube_dl/extractor/xnxx.py +++ b/youtube_dl/extractor/xnxx.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote +from .common import InfoExtractor class XNXXIE(InfoExtractor): diff --git a/youtube_dl/extractor/xstream.py b/youtube_dl/extractor/xstream.py index 76c91bd92..6a17ae286 100644 --- a/youtube_dl/extractor/xstream.py +++ b/youtube_dl/extractor/xstream.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( + find_xpath_attr, int_or_none, parse_iso8601, - xpath_with_ns, xpath_text, - find_xpath_attr, + xpath_with_ns, ) +from .common import InfoExtractor class XstreamIE(InfoExtractor): diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py index 83bc1fef2..41067ad6e 100644 --- a/youtube_dl/extractor/xtube.py +++ b/youtube_dl/extractor/xtube.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import itertools import re -from .common import InfoExtractor from ..utils import ( int_or_none, orderedSet, @@ -11,6 +10,7 @@ from ..utils import ( sanitized_Request, str_to_int, ) +from .common import InfoExtractor class XTubeIE(InfoExtractor): diff --git a/youtube_dl/extractor/xuite.py b/youtube_dl/extractor/xuite.py index e0818201a..2489e5be7 100644 --- a/youtube_dl/extractor/xuite.py +++ b/youtube_dl/extractor/xuite.py @@ -3,13 +3,9 @@ from __future__ import unicode_literals import base64 -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote -from ..utils import ( - ExtractorError, - parse_iso8601, - parse_duration, -) +from ..utils import ExtractorError, parse_duration, parse_iso8601 +from .common import InfoExtractor class XuiteIE(InfoExtractor): diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dl/extractor/xvideos.py index 30825daae..bef986b7d 100644 --- a/youtube_dl/extractor/xvideos.py +++ b/youtube_dl/extractor/xvideos.py @@ -2,13 +2,9 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote -from ..utils import ( - clean_html, - ExtractorError, - determine_ext, -) +from ..utils import ExtractorError, clean_html, determine_ext +from .common import InfoExtractor class XVideosIE(InfoExtractor): diff --git a/youtube_dl/extractor/xxxymovies.py b/youtube_dl/extractor/xxxymovies.py index 5c8f17eb2..aa65feea9 100644 --- a/youtube_dl/extractor/xxxymovies.py +++ b/youtube_dl/extractor/xxxymovies.py @@ -2,11 +2,8 @@ from __future__ import unicode_literals import re +from ..utils import int_or_none, parse_duration from .common import InfoExtractor -from ..utils import ( - parse_duration, - int_or_none, -) class XXXYMoviesIE(InfoExtractor): diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index 4951414e9..a2a85df8a 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -5,24 +5,17 @@ import itertools import json import re -from .common import InfoExtractor, SearchInfoExtractor -from ..compat import ( - compat_urllib_parse, - compat_urlparse, -) +from ..compat import compat_urllib_parse, compat_urlparse from ..utils import ( - clean_html, - unescapeHTML, ExtractorError, + clean_html, + determine_ext, int_or_none, mimetype2ext, - determine_ext, -) - -from .brightcove import ( - BrightcoveLegacyIE, - BrightcoveNewIE, + unescapeHTML, ) +from .brightcove import BrightcoveLegacyIE, BrightcoveNewIE +from .common import InfoExtractor, SearchInfoExtractor from .nbc import NBCSportsVPlayerIE diff --git a/youtube_dl/extractor/yam.py b/youtube_dl/extractor/yam.py index ef5535547..223844f6a 100644 --- a/youtube_dl/extractor/yam.py +++ b/youtube_dl/extractor/yam.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_urlparse from ..utils import ( - float_or_none, - month_by_abbreviation, ExtractorError, + float_or_none, get_element_by_attribute, + month_by_abbreviation, ) +from .common import InfoExtractor class YamIE(InfoExtractor): diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dl/extractor/yandexmusic.py index fd6268ba4..d396fe4bd 100644 --- a/youtube_dl/extractor/yandexmusic.py +++ b/youtube_dl/extractor/yandexmusic.py @@ -1,16 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re import hashlib +import re -from .common import InfoExtractor from ..compat import compat_str -from ..utils import ( - ExtractorError, - int_or_none, - float_or_none, -) +from ..utils import ExtractorError, float_or_none, int_or_none +from .common import InfoExtractor class YandexMusicBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/yesjapan.py b/youtube_dl/extractor/yesjapan.py index 681338c96..3adbe7f5f 100644 --- a/youtube_dl/extractor/yesjapan.py +++ b/youtube_dl/extractor/yesjapan.py @@ -1,12 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals +from ..utils import HEADRequest, get_element_by_attribute, parse_iso8601 from .common import InfoExtractor -from ..utils import ( - HEADRequest, - get_element_by_attribute, - parse_iso8601, -) class YesJapanIE(InfoExtractor): diff --git a/youtube_dl/extractor/yinyuetai.py b/youtube_dl/extractor/yinyuetai.py index 1fd8d35c6..7fd081a8d 100644 --- a/youtube_dl/extractor/yinyuetai.py +++ b/youtube_dl/extractor/yinyuetai.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import ExtractorError +from .common import InfoExtractor class YinYueTaiIE(InfoExtractor): diff --git a/youtube_dl/extractor/ynet.py b/youtube_dl/extractor/ynet.py index c4ae4d88e..69074ea91 100644 --- a/youtube_dl/extractor/ynet.py +++ b/youtube_dl/extractor/ynet.py @@ -1,11 +1,11 @@ # coding: utf-8 from __future__ import unicode_literals -import re import json +import re -from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote_plus +from .common import InfoExtractor class YnetIE(InfoExtractor): diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py index e37f237c7..c943b1519 100644 --- a/youtube_dl/extractor/youku.py +++ b/youtube_dl/extractor/youku.py @@ -8,15 +8,9 @@ import re import string import time +from ..compat import compat_ord, compat_urllib_parse_urlencode +from ..utils import ExtractorError, get_element_by_attribute from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlencode, - compat_ord, -) -from ..utils import ( - ExtractorError, - get_element_by_attribute, -) class YoukuIE(InfoExtractor): diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index 34ab878a4..035f79a9e 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor +from ..aes import aes_decrypt_text from ..utils import ( int_or_none, sanitized_Request, @@ -10,7 +10,7 @@ from ..utils import ( unescapeHTML, unified_strdate, ) -from ..aes import aes_decrypt_text +from .common import InfoExtractor class YouPornIE(InfoExtractor): diff --git a/youtube_dl/extractor/yourupload.py b/youtube_dl/extractor/yourupload.py index 9fa772838..97be508f3 100644 --- a/youtube_dl/extractor/yourupload.py +++ b/youtube_dl/extractor/yourupload.py @@ -1,8 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor from ..utils import urljoin +from .common import InfoExtractor class YourUploadIE(InfoExtractor): diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 630586796..4369e5f77 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals - import itertools import json import os.path @@ -11,23 +10,23 @@ import re import time import traceback -from .common import InfoExtractor, SearchInfoExtractor -from ..jsinterp import JSInterpreter -from ..swfinterp import SWFInterpreter from ..compat import ( compat_chr, compat_parse_qs, + compat_str, compat_urllib_parse_unquote, compat_urllib_parse_unquote_plus, compat_urllib_parse_urlencode, compat_urllib_parse_urlparse, compat_urlparse, - compat_str, ) +from ..jsinterp import JSInterpreter +from ..swfinterp import SWFInterpreter from ..utils import ( + ExtractorError, + ISO3166Utils, clean_html, error_to_compat_str, - ExtractorError, float_or_none, get_element_by_attribute, get_element_by_id, @@ -46,8 +45,8 @@ from ..utils import ( unsmuggle_url, uppercase_escape, urlencode_postdata, - ISO3166Utils, ) +from .common import InfoExtractor, SearchInfoExtractor class YoutubeBaseInfoExtractor(InfoExtractor): diff --git a/youtube_dl/extractor/zapiks.py b/youtube_dl/extractor/zapiks.py index bacb82eee..53b91c564 100644 --- a/youtube_dl/extractor/zapiks.py +++ b/youtube_dl/extractor/zapiks.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..utils import ( + int_or_none, parse_duration, parse_iso8601, - xpath_with_ns, xpath_text, - int_or_none, + xpath_with_ns, ) +from .common import InfoExtractor class ZapiksIE(InfoExtractor): diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index a365923fb..edb5f96d6 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -3,12 +3,11 @@ from __future__ import unicode_literals import re -from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + NO_DEFAULT, determine_ext, int_or_none, - NO_DEFAULT, orderedSet, parse_codecs, qualities, @@ -17,6 +16,7 @@ from ..utils import ( update_url_query, urljoin, ) +from .common import InfoExtractor class ZDFBaseIE(InfoExtractor): diff --git a/youtube_dl/extractor/zingmp3.py b/youtube_dl/extractor/zingmp3.py index adfdcaabf..d5c3dcef7 100644 --- a/youtube_dl/extractor/zingmp3.py +++ b/youtube_dl/extractor/zingmp3.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import re +from ..utils import ExtractorError, int_or_none, update_url_query from .common import InfoExtractor -from ..utils import ( - ExtractorError, - int_or_none, - update_url_query, -) class ZingMp3BaseInfoExtractor(InfoExtractor):